Avoid reading known annotation during startup for libtruffle attach.

Author: chumer

truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/InternalResourceCache.java

@@ -203,8 +203,8 @@ boolean requiresEagerUnpack() {
      * the Truffle runtime is created and accessor classes are initialized. For this reason, it
      * cannot use {@code EngineSupport} to call this method, nor can this method use any accessor.
      */
-    static Path installRuntimeResource(InternalResource resource) throws IOException {
-        InternalResourceCache cache = createRuntimeResourceCache(resource);
+    static Path installRuntimeResource(InternalResource resource, String id) throws IOException {
+        InternalResourceCache cache = createRuntimeResourceCache(resource, id);
         synchronized (cache) {
             Path result = cache.path;
             if (result == null) {
@@ -215,14 +215,21 @@ static Path installRuntimeResource(InternalResource resource) throws IOException
         }
     }
 
-    private static InternalResourceCache createRuntimeResourceCache(InternalResource resource) {
-        InternalResource.Id id = resource.getClass().getAnnotation(InternalResource.Id.class);
-        assert id != null : resource.getClass() + " must be annotated by @InternalResource.Id";
-        InternalResourceCache cache = new InternalResourceCache(PolyglotEngineImpl.ENGINE_ID, id.value(), () -> resource);
+    private static InternalResourceCache createRuntimeResourceCache(InternalResource resource, String id) {
+        assert verifyAnnotationConsistency(resource, id) : resource.getClass() + " must be annotated by @InternalResource.Id(\"" + id + "\"";
+        InternalResourceCache cache = new InternalResourceCache(PolyglotEngineImpl.ENGINE_ID, id, () -> resource);
         InternalResourceRoots.initializeRuntimeResource(cache);
         return cache;
     }
 
+    private static boolean verifyAnnotationConsistency(InternalResource resource, String expectedId) {
+        InternalResource.Id id = resource.getClass().getAnnotation(InternalResource.Id.class);
+        if (id == null) {
+            return false;
+        }
+        return id.value().equals(expectedId);
+    }
+
     private static InternalResource.Env createInternalResourceEnvReflectively(InternalResource resource) {
         try {
             Constructor<InternalResource.Env> newEnv = InternalResource.Env.class.getDeclaredConstructor(InternalResource.class, BooleanSupplier.class);

truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/JDKSupport.java

@@ -119,7 +119,7 @@ private static ModulesAccessor initializeModuleAccessor() {
                 return null;
             }
             try {
-                Path truffleAttachRoot = InternalResourceCache.installRuntimeResource(new LibTruffleAttachResource());
+                Path truffleAttachRoot = InternalResourceCache.installRuntimeResource(new LibTruffleAttachResource(), LibTruffleAttachResource.ID);
                 Path libAttach = truffleAttachRoot.resolve("bin").resolve(System.mapLibraryName("truffleattach"));
                 attachLibPath = libAttach.toString();
             } catch (IOException ioe) {