Better error reporting for invalid native objects in pre-initialized …

…context.
ZhangTongLe · Feb 5, 2018 · 5d4b884 · 5d4b884
1 parent 7ad70ed
commit 5d4b884
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 75 deletions.
diff --git a/...m/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeObjectReplacer.java b/...m/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeObjectReplacer.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2018, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.truffle.nfi;
+
+import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
+import java.util.IdentityHashMap;
+import java.util.function.Function;
+import org.graalvm.nativeimage.Feature.DuringSetupAccess;
+
+/**
+ * Fields that contain native pointers can not be part of the image heap, because the native
+ * pointers refer to allocations from the image builder, and are not valid anymore at runtime.
+ */
+public final class NativeObjectReplacer implements Function<Object, Object> {
+
+    private final IdentityHashMap<Class<?>, Object> disallowedClasses;
+
+    NativeObjectReplacer(DuringSetupAccess access) {
+        disallowedClasses = new IdentityHashMap<>(15);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.ClosureNativePointer"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.ClosureNativePointer$NativeDestructor"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFILibrary"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFISignature"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFISymbol"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFIType$ArrayType"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFIType$ClosureType"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFIType$EnvType"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFIType$ObjectType"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFIType$SimpleType"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFIType$StringType"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.LibFFIType$VoidType"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.NativeAllocation$FreeDestructor"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.NativePointer"), Boolean.FALSE);
+        disallowedClasses.put(access.findClassByName("com.oracle.truffle.nfi.impl.NativeString"), Boolean.FALSE);
+    }
+
+    @Override
+    public Object apply(Object obj) {
+        if (disallowedClasses.containsKey(obj.getClass())) {
+            throw new UnsupportedFeatureException(String.format("Native object (%s) stored in pre-initialized context.", obj.getClass().getSimpleName()));
+        }
+        return obj;
+    }
+}
diff --git a/...m/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeReferenceField.java b/...m/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeReferenceField.java
diff --git a/...c/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_ClosureNativePointer.java b/...c/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_ClosureNativePointer.java
@@ -22,9 +22,6 @@
  */
 package com.oracle.svm.truffle.nfi;
 
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.WordFactory;
 
@@ -35,18 +32,10 @@
 @TargetClass(className = "com.oracle.truffle.nfi.impl.ClosureNativePointer", onlyWith = TruffleNFIFeature.IsEnabled.class)
 final class Target_com_oracle_truffle_nfi_impl_ClosureNativePointer {
 
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NativeReferenceField.class) long codePointer;
-
     @Substitute
     private static void freeClosure(long closure) {
         com.oracle.svm.truffle.nfi.LibFFI.ClosureData data = WordFactory.pointer(closure);
         ImageSingletons.lookup(TruffleNFISupport.class).destroyClosureHandle(data.nativeClosureHandle());
         LibFFI.ffi_closure_free(data);
     }
 }
-
-@TargetClass(className = "com.oracle.truffle.nfi.impl.ClosureNativePointer", innerClass = "NativeDestructor", onlyWith = TruffleNFIFeature.IsEnabled.class)
-final class Target_com_oracle_truffle_nfi_impl_ClosureNativePointer_NativeDestructor {
-
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NativeReferenceField.class) long nativeClosure;
-}
diff --git a/....nfi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_LibFFILibrary.java b/....nfi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_LibFFILibrary.java
@@ -23,12 +23,10 @@
 package com.oracle.svm.truffle.nfi;
 
 import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.TargetClass;
 
 @TargetClass(className = "com.oracle.truffle.nfi.impl.LibFFILibrary", onlyWith = TruffleNFIFeature.IsEnabled.class)
 final class Target_com_oracle_truffle_nfi_impl_LibFFILibrary {
 
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NativeReferenceField.class) long handle;
+    @Alias long handle;
 }
diff --git a/...fi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_LibFFISignature.java b/...fi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_LibFFISignature.java
@@ -23,14 +23,12 @@
 package com.oracle.svm.truffle.nfi;
 
 import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.TargetClass;
 
 @TargetClass(className = "com.oracle.truffle.nfi.impl.LibFFISignature", onlyWith = TruffleNFIFeature.IsEnabled.class)
 final class Target_com_oracle_truffle_nfi_impl_LibFFISignature {
 
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NativeReferenceField.class) long cif;
+    @Alias long cif;
 
     @Alias
     public native Target_com_oracle_truffle_nfi_impl_LibFFIType[] getArgTypes();

diff --git a/...fle.nfi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_LibFFIType.java b/...fle.nfi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_LibFFIType.java
@@ -23,8 +23,6 @@
 package com.oracle.svm.truffle.nfi;
 
 import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.TargetClass;
 
 @TargetClass(className = "com.oracle.truffle.nfi.impl.LibFFIType", onlyWith = TruffleNFIFeature.IsEnabled.class)
@@ -34,7 +32,7 @@ final class Target_com_oracle_truffle_nfi_impl_LibFFIType {
     @Alias protected int alignment;
     @Alias protected int objectCount;
 
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NativeReferenceField.class) protected long type;
+    @Alias protected long type;
 }
 
 @TargetClass(className = "com.oracle.truffle.nfi.impl.LibFFIType", innerClass = "StringType", onlyWith = TruffleNFIFeature.IsEnabled.class)

diff --git a/...i/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_NativeAllocation.java b/...i/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_NativeAllocation.java
@@ -48,9 +48,3 @@ static void free(long pointer) {
     @Alias @RecomputeFieldValue(kind = Kind.FromAlias) //
     static final AtomicReference<Thread> gcThread = new AtomicReference<>(null);
 }
-
-@TargetClass(className = "com.oracle.truffle.nfi.impl.NativeAllocation", innerClass = "FreeDestructor", onlyWith = TruffleNFIFeature.IsEnabled.class)
-final class Target_com_oracle_truffle_nfi_impl_NativeAllocation_FreeDestructor {
-
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NativeReferenceField.class) long address;
-}
diff --git a/....nfi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_NativePointer.java b/....nfi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_NativePointer.java
@@ -23,8 +23,6 @@
 package com.oracle.svm.truffle.nfi;
 
 import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.TargetClass;
 
 @TargetClass(className = "com.oracle.truffle.nfi.impl.NativePointer", onlyWith = TruffleNFIFeature.IsEnabled.class)
@@ -33,6 +31,4 @@ final class Target_com_oracle_truffle_nfi_impl_NativePointer {
     @Alias
     Target_com_oracle_truffle_nfi_impl_NativePointer(@SuppressWarnings("unused") long pointer) {
     }
-
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NativeReferenceField.class) long nativePointer;
 }
diff --git a/...e.nfi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_NativeString.java b/...e.nfi/src/com/oracle/svm/truffle/nfi/Target_com_oracle_truffle_nfi_impl_NativeString.java
@@ -25,16 +25,14 @@
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 
 @TargetClass(className = "com.oracle.truffle.nfi.impl.NativeString", onlyWith = TruffleNFIFeature.IsEnabled.class)
 final class Target_com_oracle_truffle_nfi_impl_NativeString {
 
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = NativeReferenceField.class) long nativePointer;
+    @Alias long nativePointer;
 
     @Substitute
     @TruffleBoundary

diff --git a/...tevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/TruffleNFIFeature.java b/...tevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/TruffleNFIFeature.java
@@ -56,5 +56,6 @@ public List<Class<? extends Feature>> getRequiredFeatures() {
     @Override
     public void duringSetup(DuringSetupAccess access) {
         ImageSingletons.add(TruffleNFISupport.class, new TruffleNFISupport());
+        access.registerObjectReplacer(new NativeObjectReplacer(access));
     }
 }