Revert "Move kVRegSize to globals.h to reduce include dependencies."
This reverts commit 5ae7cdfe5b8da645d1fec61c76176e6a37e78fb9.
Reason for revert: Unknown crash in linker
Change-Id: Ib5646376e2e589a7a6c4d66e72caa1f208a15905
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h
index 833b39e..f0c4ee0 100644
--- a/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@ -35,6 +35,7 @@
#include "optimizing_compiler_stats.h"
#include "read_barrier_option.h"
#include "stack.h"
+#include "stack_map.h"
#include "utils/label.h"
namespace art {
diff --git a/libartbase/base/globals.h b/libartbase/base/globals.h
index 39e0c50..69d1a64 100644
--- a/libartbase/base/globals.h
+++ b/libartbase/base/globals.h
@@ -38,9 +38,6 @@
// compile-time constant so the compiler can generate better code.
static constexpr int kPageSize = 4096;
-// Size of Dex virtual registers.
-static constexpr size_t kVRegSize = 4;
-
// Returns whether the given memory offset can be used for generating
// an implicit null check.
static inline bool CanDoImplicitNullCheckOn(uintptr_t offset) {
diff --git a/runtime/stack_map.h b/runtime/stack_map.h
index 274e2b2..3839764 100644
--- a/runtime/stack_map.h
+++ b/runtime/stack_map.h
@@ -37,6 +37,9 @@
// (signed) values.
static constexpr ssize_t kFrameSlotSize = 4;
+// Size of Dex virtual registers.
+static constexpr size_t kVRegSize = 4;
+
class ArtMethod;
class CodeInfo;
class StackMapEncoding;
