Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0b

2 files changed, 5 insertions, 5 deletions

diff --git a/vm/analysis/DexPrepare.cpp b/vm/analysis/DexPrepare.cpp
index 61d579701..753b6fee0 100644
--- a/vm/analysis/DexPrepare.cpp
+++ b/vm/analysis/DexPrepare.cpp
@@ -1153,7 +1153,7 @@ static const u1* getSignature(const ClassPathEntry* cpe)
  * If this changes, update DEX_OPT_MAGIC_VERS.
  */
 static const size_t kMinDepSize = 4 * 4;
-static const size_t kMaxDepSize = 4 * 4 + 3056;     // sanity check
+static const size_t kMaxDepSize = 4 * 4 + 3200;     // sanity check
 
 /*
  * Read the "opt" header, verify it, then read the dependencies section
diff --git a/vm/native/java_lang_System.cpp b/vm/native/java_lang_System.cpp
index 33c295554..4e200d6a1 100644
--- a/vm/native/java_lang_System.cpp
+++ b/vm/native/java_lang_System.cpp
@@ -62,10 +62,6 @@
  * TODO: use __builtin_prefetch
  * TODO: write an ARM-optimized version
  */
-#if defined(HAVE_HALFWORD_ATOMIC_MEMMOVE)
-#define move16 memmove
-#define move32 memmove
-#else
 static void memmove_words(void* dest, const void* src, size_t n) {
     assert((((uintptr_t) dest | (uintptr_t) src | n) & 0x01) == 0);
 
@@ -179,6 +175,10 @@ static void memmove_words(void* dest, const void* src, size_t n) {
     }
 }
 
+#if defined(HAVE_HALFWORD_ATOMIC_MEMMOVE)
+#define move16 memmove
+#define move32 memmove_words
+#else
 #define move16 memmove_words
 #define move32 memmove_words
 #endif