# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1420562693 28800
# Node ID 60384ae61d95a156f9b2cfeea2835842ec2def65
# Parent  e23a5de08e2a03b09024ab86b85f89207a301a5f# Parent  714f4931b02c5a0d7a6a870f4d70d160536788df
Merge

diff -r 714f4931b02c -r 60384ae61d95 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java	Tue Jan 06 00:43:09 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java	Tue Jan 06 08:44:53 2015 -0800
@@ -84,6 +84,7 @@
      * Used to implement {@link ResolvedJavaType#findUniqueConcreteMethod(ResolvedJavaMethod)}.
      *
      * @param metaspaceMethod the metaspace Method on which to based the search
+     * @param actualHolderMetaspaceKlass the best known type of receiver
      * @return the metaspace Method result or 0 is there is no unique concrete method for
      *         {@code metaspaceMethod}
      */
diff -r 714f4931b02c -r 60384ae61d95 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java	Tue Jan 06 00:43:09 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java	Tue Jan 06 08:44:53 2015 -0800
@@ -505,7 +505,7 @@
             return hmethod.uniqueConcreteMethod(declaredHolder);
         }
         /*
-         * The holder may be a subtype of the decaredHolder so make sure to resolve the method to
+         * The holder may be a subtype of the declaredHolder so make sure to resolve the method to
          * the correct method for the subtype.
          */
         HotSpotResolvedJavaMethod resolvedMethod = (HotSpotResolvedJavaMethod) resolveMethod(hmethod, this, true);
diff -r 714f4931b02c -r 60384ae61d95 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java	Tue Jan 06 00:43:09 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java	Tue Jan 06 08:44:53 2015 -0800
@@ -498,15 +498,6 @@
             return size;
         }
 
-        static class WarnOnce {
-            static {
-                System.out.println("VerifyHeapNode requires a VM with asserts enabled.");
-            }
-
-            static void warn() {
-            }
-        }
-
         public void lower(VerifyHeapNode verifyHeapNode, HotSpotRegistersProvider registers, HotSpotGraalRuntimeProvider runtime, LoweringTool tool) {
             if (runtime.getConfig().cAssertions) {
                 Arguments args = new Arguments(verifyHeap, verifyHeapNode.graph().getGuardsStage(), tool.getLoweringStage());
@@ -515,7 +506,6 @@
                 SnippetTemplate template = template(args);
                 template.instantiate(providers.getMetaAccess(), verifyHeapNode, DEFAULT_REPLACER, args);
             } else {
-                WarnOnce.warn();
                 GraphUtil.removeFixedWithUnusedInputs(verifyHeapNode);
             }
         }