Mercurial > hg > truffle

changeset 18538:1b904c58f27f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed static accesses to HotSpotGraalRuntime out of LocalImpl
author Doug Simon <doug.simon@oracle.com>
date Wed, 26 Nov 2014 17:43:38 +0100
parents ee1b8eb230f7
children 3b7dbb34bd9e
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/LocalImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethodImpl.java
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/LocalImpl.java	Wed Nov 26 17:40:50 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/LocalImpl.java	Wed Nov 26 17:43:38 2014 +0100
@@ -22,10 +22,7 @@
  */
 package com.oracle.graal.hotspot.debug;
 
-import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*;
-
 import com.oracle.graal.api.meta.*;
-import com.oracle.graal.hotspot.meta.*;
 
 public class LocalImpl implements Local {
 
@@ -35,12 +32,12 @@
     private final int slot;
     private final JavaType type;
 
-    public LocalImpl(String name, String type, HotSpotResolvedObjectType holder, int startBci, int endBci, int slot) {
+    public LocalImpl(String name, JavaType type, int startBci, int endBci, int slot) {
         this.name = name;
         this.startBci = startBci;
         this.endBci = endBci;
         this.slot = slot;
-        this.type = runtime().lookupType(type, holder, false);
+        this.type = type;
     }
 
     @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethodImpl.java	Wed Nov 26 17:40:50 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethodImpl.java	Wed Nov 26 17:43:38 2014 +0100
@@ -604,7 +604,7 @@
             String localName = getConstantPool().lookupUtf8(nameCpIndex);
             String localType = getConstantPool().lookupUtf8(typeCpIndex);
 
-            locals[i] = new LocalImpl(localName, localType, holder, startBci, endBci, slot);
+            locals[i] = new LocalImpl(localName, runtime().lookupType(localType, holder, false), startBci, endBci, slot);
 
             // Go to the next LocalVariableTableElement
             localVariableTableElement += config.localVariableTableElementSize;