--- a/src/hotspot/share/ci/ciReplay.cpp Mon Oct 30 16:37:53 2017 +0100
+++ b/src/hotspot/share/ci/ciReplay.cpp Tue Oct 31 11:55:09 2017 -0400
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "jvm.h"
#include "ci/ciMethodData.hpp"
#include "ci/ciReplay.hpp"
#include "ci/ciSymbol.hpp"
@@ -33,7 +34,6 @@
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
-#include "prims/jvm.h"
#include "utilities/copy.hpp"
#include "utilities/macros.hpp"
@@ -790,7 +790,7 @@
while (field_signature[rank] == '[') {
rank++;
}
- int* dims = NEW_RESOURCE_ARRAY(int, rank);
+ jint* dims = NEW_RESOURCE_ARRAY(jint, rank);
dims[0] = length;
for (int i = 1; i < rank; i++) {
dims[i] = 1; // These aren't relevant to the compiler