sync with compiler suite

Author: tkrodriguez

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/parsing/model/InputMethodTest.java

@@ -69,7 +69,7 @@ public void testGetSetBytecodes() {
         assertNull(m.getBytecodes().get(2).getInlined());
         assertNull(m.getBytecodes().get(6).getInlined());
 
-        m = new InputMethod(g, "name", "shortName", -1, LocationCache.createMethod(null, null, bytecode));
+        m = new InputMethod(g, "name", "shortName", -1, LocationCache.createMethod("fakeMethod", "FakeClass", bytecode));
 
         assertEquals(7, m.getBytecodes().size());
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/parsing/BinaryReader.java

@@ -246,6 +246,8 @@ public abstract static class Member implements LengthToString {
         public final String name;
 
         private Member(Klass holder, String name, int accessFlags) {
+            assert holder != null : "GraphElements.methodDeclaringClass must not return null!";
+            assert name != null;
             this.holder = holder;
             this.accessFlags = accessFlags;
             this.name = name;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/parsing/LocationStackFrame.java

@@ -49,7 +49,7 @@ public String toString() {
         String sep = "";
         for (LocationStackFrame t = this; t != null; t = t.parent) {
             sb.append(sep);
-            sb.append(methodHolderName(t)).append(".").append(t.method.name);
+            sb.append(methodHolderName(t)).append(".").append(methodName(t));
             for (LocationStratum s : t.strata) {
                 if (s.file != null) {
                     sb.append("(").append(s.file).append(":").append(s.line).append(")");
@@ -63,6 +63,10 @@ public String toString() {
         return sb.toString();
     }
 
+    private static String methodName(LocationStackFrame t) {
+        return t != null && t.method != null ? t.method.name : null;
+    }
+
     private static String methodHolderName(LocationStackFrame t) {
         if (t != null && t.method != null && t.method.holder != null) {
             return t.method.holder.name;

visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/LocationStackFrame.java

@@ -66,6 +66,7 @@ public String toString() {
     private static String methodName(LocationStackFrame t) {
         return t != null && t.method != null ? t.method.name : null;
     }
+
     private static String methodHolderName(LocationStackFrame t) {
         if (t != null && t.method != null && t.method.holder != null) {
             return t.method.holder.name;