Merge "Revert^2 "Move kVRegSize to globals.h to reduce include dependencies.""

2 files changed, 3 insertions, 3 deletions

diff --git a/libartbase/base/globals.h b/libartbase/base/globals.h
index 69d1a64a3b..39e0c509cd 100644
--- a/libartbase/base/globals.h
+++ b/libartbase/base/globals.h
@@ -38,6 +38,9 @@ static constexpr size_t kStackAlignment = 16;
 // 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 7d3d56a1d2..fb1867488e 100644
--- a/runtime/stack_map.h
+++ b/runtime/stack_map.h
@@ -37,9 +37,6 @@ class VariableIndentationOutputStream;
 // (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;