diff options
| author | Elliott Hughes <enh@google.com> | 2012-05-03 18:35:53 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-05-03 18:35:53 -0700 |
| commit | 0b88861edfe5c0d57e0bb4a1cccb04f1916b5e9f (patch) | |
| tree | 4b68db62ffd23980f58ccb53c68a1f3aa2583c0d /vm/compiler/Compiler.cpp | |
| parent | 901167c1d78403bedcb48a20f46a971fae392a27 (diff) | |
| parent | 93a44a282327b44a84af59f201eaf58df02c449f (diff) | |
resolved conflicts for merge of 93a44a28 to jb-dev-plus-aosp
Change-Id: I9c1f2e37602bea86e70333d2b274665e99fcbd92
Diffstat (limited to 'vm/compiler/Compiler.cpp')
| -rw-r--r-- | vm/compiler/Compiler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/compiler/Compiler.cpp b/vm/compiler/Compiler.cpp index b9b310516..e5399081d 100644 --- a/vm/compiler/Compiler.cpp +++ b/vm/compiler/Compiler.cpp @@ -313,9 +313,9 @@ static void resetCodeCache(void) * Wipe out the code cache content to force immediate crashes if * stale JIT'ed code is invoked. */ - memset((char *) gDvmJit.codeCache + gDvmJit.templateSize, - 0, - gDvmJit.codeCacheByteUsed - gDvmJit.templateSize); + dvmCompilerCacheClear((char *) gDvmJit.codeCache + gDvmJit.templateSize, + gDvmJit.codeCacheByteUsed - gDvmJit.templateSize); + dvmCompilerCacheFlush((intptr_t) gDvmJit.codeCache, (intptr_t) gDvmJit.codeCache + gDvmJit.codeCacheByteUsed, 0); |