Mercurial > hg > truffle

diff c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotSignature.java @ 1433:efba53f86c4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
various fixes and enhancements * correct refmap->oopmap conversion (register numbering, stack slot numbering) * fixes for inlining (correct scoping in exception handler lookup, NPE in scope conversion) * support for "jump to runtime stub" (patching code needs to be aware of jmp instruction) * provide more information about methods (to allow inlining: has_balanced_monitors, etc.) * fixes to signature type lookup * isSubTypeOf: correct handling of array classes * RiType: componentType/arrayOf * prologue: inline cache check, icmiss stub * klass state check (resolved but not initialized) in newinstance * card table write barriers * c1x classes are optional (to allow running c1 without them) * correct for stored frame pointer in calling conventions (methods with arguments on stack) * getType(Class<?>) for some basic types, used for optimizations and folding * RiMethod/RiType: throw exception instead of silent failure on unsupported operations * RiType: resolved/unresolved array type support * refactoring: new on-demand template generation mechanism * optimizations: template specialization for no_null_check, given length, etc.
author Lukas Stadler <lukas.stadler@oracle.com>
date Thu, 16 Sep 2010 19:42:20 -0700
parents 760213a60e8b
children 9e5e83ca2259
line wrap: on
line diff
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotSignature.java	Wed Sep 01 17:13:38 2010 -0700
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotSignature.java	Thu Sep 16 19:42:20 2010 -0700
@@ -32,6 +32,8 @@
     private final List<String> arguments = new ArrayList<String>();
     private final String returnType;
     private final String originalString;
+    private RiType[] argumentTypes;
+    private RiType returnTypeCache;
 
     public HotSpotSignature(String signature) {
         assert signature.length() > 0;
@@ -58,7 +60,7 @@
         char first;
         do {
             first = signature.charAt(cur++);
-        } while(first == '[');
+        } while (first == '[');
 
         switch (first) {
             case 'L':
@@ -105,11 +107,19 @@
 
     @Override
     public RiType argumentTypeAt(int index, RiType accessingClass) {
-        long accessor = 0;
-        if (accessingClass instanceof HotSpotTypeResolved) {
-            accessor = (Long) ((HotSpotTypeResolved) accessingClass).getVmId();
+        if (argumentTypes == null) {
+            argumentTypes = new RiType[arguments.size()];
         }
-        return Compiler.getVMEntries().RiSignature_lookupType(arguments.get(index), accessor);
+        RiType type = argumentTypes[index];
+        if (type == null) {
+            long accessor = 0;
+            if (accessingClass instanceof HotSpotTypeResolved) {
+                accessor = (Long) ((HotSpotTypeResolved) accessingClass).getVmId();
+            }
+            type = Compiler.getVMEntries().RiSignature_lookupType(arguments.get(index), accessor);
+            argumentTypes[index] = type;
+        }
+        return type;
     }
 
     @Override
@@ -124,11 +134,14 @@
 
     @Override
     public RiType returnType(RiType accessingClass) {
-        long accessor = 0;
-        if (accessingClass instanceof HotSpotTypeResolved) {
-            accessor = (Long) ((HotSpotTypeResolved) accessingClass).getVmId();
+        if (returnTypeCache == null) {
+            long accessor = 0;
+            if (accessingClass instanceof HotSpotTypeResolved) {
+                accessor = (Long) ((HotSpotTypeResolved) accessingClass).getVmId();
+            }
+            returnTypeCache = Compiler.getVMEntries().RiSignature_lookupType(returnType, accessor);
         }
-        return Compiler.getVMEntries().RiSignature_lookupType(returnType, accessor);
+        return returnTypeCache;
     }
 
     @Override