[aarch64-port-dev ] RFR: 8u77

[Edward Nevill]

On Wed, 2016-03-30 at 14:36 +0200, Matthias Klose wrote:
> On 29.03.2016 17:44, Andrew Hughes wrote:
> >
> >
> > ----- Original Message -----
> >> On 29/03/16 03:49, Andrew Hughes wrote:
> >>> http://cr.openjdk.java.net/~andrew/aarch64-8/u77/
> >>>
> >>> The interesting changes are in the jdk tree. The rest are just tags.
> >>>
> >>> Ok to push?
> >>
> >> Yes, thanks.
> >>
> >> Andrew.
> >>
> >>
> >
> > Thanks, pushed.
> 
> this broke builds configured with --disable-precompiled-headers:
> 
> /«PKGBUILDDIR»/src/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp: In 
> member function 'void MacroAssembler::trampoline_call(Address, CodeBuffer*)':
> /«PKGBUILDDIR»/src/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp:679:26: 
> error: incomplete type 'Compile' used in nested name specifier
>     if (far_branches() && !Compile::current()->in_scratch_emit_size()) {

The problem is there is a dependency from macroAssembler_aarch64.cpp to C2, but macroAssembler_aarch64.cpp does not include the headers it needs from C2.

The following patch will get the build going again,

OK to push to jdk8u?

All the best,
Ed.

--- CUT HERE ---
diff -r 895a79fdb9d5 src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
--- a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp     Wed Mar 23 17:20:08 2016 +0000
+++ b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp     Thu Mar 31 04:25:30 2016 +0000
@@ -55,6 +55,11 @@
 #include "gc_implementation/g1/heapRegion.hpp"
 #endif
 
+#ifdef COMPILER2
+#include "opto/node.hpp"
+#include "opto/compile.hpp"
+#endif
+
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */
 #define STOP(error) stop(error)
--- CUT HERE ---