diff -r 5bce1b7e7800 -r 47f19ff9903c src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java Fri Feb 02 10:37:48 2018 -0500 +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java Fri Feb 02 17:28:17 2018 -0800 @@ -32,13 +32,15 @@ import java.util.List; import java.util.function.Consumer; +import org.graalvm.collections.EconomicMap; +import org.graalvm.collections.Equivalence; import org.graalvm.compiler.asm.AbstractAddress; import org.graalvm.compiler.asm.Assembler; -import org.graalvm.compiler.core.common.NumUtil; import org.graalvm.compiler.code.CompilationResult; import org.graalvm.compiler.code.CompilationResult.CodeAnnotation; import org.graalvm.compiler.code.DataSection.Data; import org.graalvm.compiler.code.DataSection.RawData; +import org.graalvm.compiler.core.common.NumUtil; import org.graalvm.compiler.core.common.cfg.AbstractBlockBase; import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; import org.graalvm.compiler.core.common.type.DataPointerConstant; @@ -55,8 +57,6 @@ import org.graalvm.compiler.options.OptionKey; import org.graalvm.compiler.options.OptionType; import org.graalvm.compiler.options.OptionValues; -import org.graalvm.util.EconomicMap; -import org.graalvm.util.Equivalence; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.DebugInfo; @@ -324,12 +324,32 @@ } /** - * Notifies this object of a branch instruction at offset {@code pos} in the code. + * Notifies this object of a branch instruction at offset {@code pcOffset} in the code. * * @param isNegated negation status of the branch's condition. */ @SuppressWarnings("unused") - public void recordBranch(int pos, boolean isNegated) { + public void recordBranch(int pcOffset, boolean isNegated) { + } + + /** + * Notifies this object of a call instruction belonging to an INVOKEVIRTUAL or INVOKEINTERFACE + * at offset {@code pcOffset} in the code. + * + * @param nodeSourcePosition source position of the corresponding invoke. + */ + @SuppressWarnings("unused") + public void recordInvokeVirtualOrInterfaceCallOp(int pcOffset, NodeSourcePosition nodeSourcePosition) { + } + + /** + * Notifies this object of a call instruction belonging to an INLINE_INVOKE at offset + * {@code pcOffset} in the code. + * + * @param nodeSourcePosition source position of the corresponding invoke. + */ + @SuppressWarnings("unused") + public void recordInlineInvokeCallOp(int pcOffset, NodeSourcePosition nodeSourcePosition) { } /**