Get correct TR_ALLOC definition in jitbuilder files

Due to header file ordering, the wrong (empty) declaration of TR_ALLOC is used in OMRIlBuilder.cpp and OMRVirtualMachineOperandStack.cpp. Fix that by directly including env/TRMemory.hpp early. Signed-off-by: Mark Stoodley <mstoodle@ca.ibm.com>
eclipse · Aug 1, 2018 · bdea4f5 · bdea4f5
1 parent 6fa7636
commit bdea4f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/compiler/ilgen/OMRIlBuilder.cpp b/compiler/ilgen/OMRIlBuilder.cpp
@@ -19,6 +19,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
  *******************************************************************************/
 
+#include "env/TRMemory.hpp"    // must precede IlBuilder.hpp to get TR_ALLOC
 #include "ilgen/IlBuilder.hpp"
 
 #include <stdint.h>

diff --git a/compiler/ilgen/OMRVirtualMachineOperandStack.cpp b/compiler/ilgen/OMRVirtualMachineOperandStack.cpp
@@ -19,7 +19,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
  *******************************************************************************/
 
+#include "env/TRMemory.hpp"   // include first to get correct TR_ALLOC definition
 #include "ilgen/VirtualMachineOperandStack.hpp"
+
 #include "ilgen/VirtualMachineRegister.hpp"
 #include "compile/Compilation.hpp"
 #include "il/SymbolReference.hpp"