Refactor ImageHeapScanner.

Author: cstancu

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java

@@ -518,16 +518,16 @@ protected void onObjectReachable(ImageHeapConstant imageHeapConstant, ScanReason
 
         AnalysisType type = imageHeapConstant.getType(metaAccess);
         Object object = bb.getSnippetReflectionProvider().asObject(Object.class, imageHeapConstant);
-        try {
-            /* Simulated constants don't have a backing object and don't need to be processed. */
-            if (object != null) {
+        /* Simulated constants don't have a backing object and don't need to be processed. */
+        if (object != null) {
+            try {
                 type.notifyObjectReachable(universe.getConcurrentAnalysisAccess(), object);
+            } catch (UnsupportedFeatureException e) {
+                /* Enhance the unsupported feature message with the object trace and rethrow. */
+                StringBuilder backtrace = new StringBuilder();
+                ObjectScanner.buildObjectBacktrace(bb, reason, backtrace);
+                throw new UnsupportedFeatureException(e.getMessage() + System.lineSeparator() + backtrace);
             }
-        } catch (UnsupportedFeatureException e) {
-            /* Enhance the unsupported feature message with the object trace and rethrow. */
-            StringBuilder backtrace = new StringBuilder();
-            ObjectScanner.buildObjectBacktrace(bb, reason, backtrace);
-            throw new UnsupportedFeatureException(e.getMessage() + System.lineSeparator() + backtrace);
         }
 
         markTypeInstantiated(objectType, reason);