# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@oracle.com>
# Date 1475230925 -7200
# Node ID 5796b1867b68b8520d5e7c8f53495ab017cf3ac6
# Parent  59f53c97a38a7c0e66b09ca6c360fe5e2ed6c098
Fix allocation of trap history (was lost in a merge)

diff -r 59f53c97a38a -r 5796b1867b68 src/share/vm/oops/methodData.hpp
--- a/src/share/vm/oops/methodData.hpp	Thu Sep 29 09:56:48 2016 -0700
+++ b/src/share/vm/oops/methodData.hpp	Fri Sep 30 12:22:05 2016 +0200
@@ -2184,7 +2184,7 @@
   uint _nof_overflow_traps;         // trap count, excluding _trap_hist
   union {
     intptr_t _align;
-    u1 _array[_trap_hist_limit];
+    u1 _array[JVMCI_ONLY(2 *) _trap_hist_limit];
   } _trap_hist;
 
   // Support for interprocedural escape analysis, from Thomas Kotzmann.