Mercurial > hg > graal-compiler
diff src/cpu/x86/vm/interp_masm_x86_32.cpp @ 14422:2b8e28fdf503
Merge
author | kvn |
---|---|
date | Tue, 05 Nov 2013 17:38:04 -0800 |
parents | 5ccbab1c69f3 |
children | ea79ab313e98 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/interp_masm_x86_32.cpp Wed Oct 16 10:52:41 2013 +0200 +++ b/src/cpu/x86/vm/interp_masm_x86_32.cpp Tue Nov 05 17:38:04 2013 -0800 @@ -23,7 +23,7 @@ */ #include "precompiled.hpp" -#include "interp_masm_x86_32.hpp" +#include "interp_masm_x86.hpp" #include "interpreter/interpreter.hpp" #include "interpreter/interpreterRuntime.hpp" #include "oops/arrayOop.hpp" @@ -1046,7 +1046,6 @@ } } - void InterpreterMacroAssembler::profile_call(Register mdp) { if (ProfileInterpreter) { Label profile_continue;