diff options
| author | Elliott Hughes <enh@google.com> | 2013-02-25 17:04:06 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-02-25 17:04:06 -0800 |
| commit | c89d83e1c05979b68037ad15413fa4460a88e36f (patch) | |
| tree | ab07cdf3e1fd71eb7cd95d9868229a0e371e4a33 /vm/compiler/codegen/x86 | |
| parent | 61862ffe7e66f2893586e5743705074e72e55c03 (diff) | |
| download | android_dalvik-c89d83e1c05979b68037ad15413fa4460a88e36f.tar.gz android_dalvik-c89d83e1c05979b68037ad15413fa4460a88e36f.tar.bz2 android_dalvik-c89d83e1c05979b68037ad15413fa4460a88e36f.zip | |
Fix -Xjitthreshold.
Previously, we'd always overwrite the user-supplied value because
the architecture-specific default gets set so late.
Bug: https://code.google.com/p/android/issues/detail?id=52017
Change-Id: I469bf9ce599820f5ce3dea346aa8f680deffb0c5
Diffstat (limited to 'vm/compiler/codegen/x86')
| -rw-r--r-- | vm/compiler/codegen/x86/CodegenInterface.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vm/compiler/codegen/x86/CodegenInterface.cpp b/vm/compiler/codegen/x86/CodegenInterface.cpp index c4ad445e5..6670bda6d 100644 --- a/vm/compiler/codegen/x86/CodegenInterface.cpp +++ b/vm/compiler/codegen/x86/CodegenInterface.cpp @@ -64,7 +64,9 @@ bool dvmCompilerArchInit() { /* Target-specific configuration */ gDvmJit.jitTableSize = 1 << 12; gDvmJit.jitTableMask = gDvmJit.jitTableSize - 1; - gDvmJit.threshold = 255; + if (gDvmJit.threshold != 0) { + gDvmJit.threshold = 255; + } gDvmJit.codeCacheSize = 512*1024; gDvmJit.optLevel = kJitOptLevelO1; |