Fix attempt oracle#3

lazar-mitrovic · May 8, 2020 · 2c1f7ac · 2c1f7ac
1 parent ba961a1
commit 2c1f7ac
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...le.svm.truffle.nfi.posix/src/com/oracle/svm/truffle/nfi/posix/PosixTruffleNFIFeature.java b/...le.svm.truffle.nfi.posix/src/com/oracle/svm/truffle/nfi/posix/PosixTruffleNFIFeature.java
@@ -108,7 +108,7 @@ private static PointerBase dlmopen(Lmid_t lmid, String filename, int mode) {
      * A single linking namespace is created lazily and registered on the NFI context instance.
      */
     private static PointerBase loadLibraryInNamespace(long nativeContext, String name, int mode) {
-        assert (mode & singleton().isolatedNamespaceFlag) == 0;
+        assert (LibCBase.singleton().hasIsolatedNamespaces()) == false;
         Target_com_oracle_truffle_nfi_impl_NFIContextLinux context = //
                         KnownIntrinsics.convertUnknownValue(getContext(nativeContext), Target_com_oracle_truffle_nfi_impl_NFIContextLinux.class);
 
@@ -147,8 +147,7 @@ private static PointerBase loadLibraryInNamespace(long nativeContext, String nam
     @Override
     protected long loadLibraryImpl(long nativeContext, String name, int flags) {
         PointerBase handle;
-        if (Platform.includedIn(Platform.LINUX.class) && isolatedNamespaceFlag == ISOLATED_NAMESPACE_FLAG // constant folding
-                && (flags & isolatedNamespaceFlag) != 0) {
+        if (Platform.includedIn(Platform.LINUX.class) && LibCBase.singleton().hasIsolatedNamespaces()) {
             handle = loadLibraryInNamespace(nativeContext, name, flags & ~isolatedNamespaceFlag);
         } else {
             handle = PosixUtils.dlopen(name, flags);