Bring Zero to llvm 3.4

[Christian Thalinger]

Filed:

[#JDK-8036619] Shark: add LLVM 3.4 support - Java Bug System

I’m going to add these changes I have as well:

diff -r 194e8b7fe9ca src/share/vm/shark/sharkCompiler.cpp
--- a/src/share/vm/shark/sharkCompiler.cpp	Thu Jan 30 14:30:01 2014 +0100
+++ b/src/share/vm/shark/sharkCompiler.cpp	Tue Mar 04 09:30:55 2014 -0800
@@ -364,3 +364,7 @@ const char* SharkCompiler::methodname(co
   *(dst++) = '\0';
   return buf;
 }
+
+void SharkCompiler::print_timers() {
+  // do nothing
+}
diff -r 194e8b7fe9ca src/share/vm/shark/sharkCompiler.hpp
--- a/src/share/vm/shark/sharkCompiler.hpp	Thu Jan 30 14:30:01 2014 +0100
+++ b/src/share/vm/shark/sharkCompiler.hpp	Tue Mar 04 09:30:55 2014 -0800
@@ -56,6 +56,9 @@ class SharkCompiler : public AbstractCom
   // Compile a normal (bytecode) method and install it in the VM
   void compile_method(ciEnv* env, ciMethod* target, int entry_bci);
 
+  // Print compilation timers and statistics
+  void print_timers();
+
   // Generate a wrapper for a native (JNI) method
   nmethod* generate_native_wrapper(MacroAssembler* masm,
                                    methodHandle    target,
diff -r 194e8b7fe9ca src/share/vm/shark/sharkInliner.cpp
--- a/src/share/vm/shark/sharkInliner.cpp	Thu Jan 30 14:30:01 2014 +0100
+++ b/src/share/vm/shark/sharkInliner.cpp	Tue Mar 04 09:30:55 2014 -0800
@@ -744,6 +744,10 @@ bool SharkInlinerHelper::do_field_access
 }
 
 bool SharkInliner::attempt_inline(ciMethod *target, SharkState *state) {
+  if (!Inline) {
+    return false;
+  }
+
   if (SharkIntrinsics::is_intrinsic(target)) {
     SharkIntrinsics::inline_intrinsic(target, state);
     return true;

On Mar 4, 2014, at 9:29 AM, Mario Torre <neugens at redhat.com> wrote:

> On Tue, 2014-03-04 at 09:25 -0800, Christian Thalinger wrote:
> 
>>> I guess I can't push it myself, right? :)
>> 
>> Nope :-)
> 
> :) One day we'll be able to change that I hope!
> 
>>> 
>>> Can you please push the patch on 9 on my behalf?
>> 
>> Yes, I will take care of it.
> 
> Thanks!
> 
>>> 
>>> I also would like to push it on 8u, but I think I need to ask a backport
>>> on the 8u mailing list fist, right?
>> 
>> Correct.
> 
> Great. Please, let me know if you need further assistance, I'll ping the
> 8u mailing list once the fix lands into the repository.
> 
> Cheers,
> Mario
> 
>