Mercurial > hg > graal-jvmci-8
changeset 18791:60384ae61d95
Merge
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Tue, 06 Jan 2015 08:44:53 -0800 |
parents | e23a5de08e2a (diff) 714f4931b02c (current diff) |
children | 7bb1abca2c0d |
files | |
diffstat | 3 files changed, 2 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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} */
--- 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);
--- 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); } }