diff options
| author | 2015-10-13 21:02:28 +0000 | |
|---|---|---|
| committer | 2015-10-13 21:02:28 +0000 | |
| commit | 85506c2ff34e930b4589568f78ee30f60d49d456 (patch) | |
| tree | c7e4b30a54046ed90a212e298f871a5df257c648 /compiler/dex/quick/quick_compiler.cc | |
| parent | 7598f145d4fd4219c14c6e2c8a03b34ce7943ffe (diff) | |
| parent | eb7c144a6aff7da673ba53d501c46f00311d4d7f (diff) | |
Merge "Add initial default method support to Art"
Diffstat (limited to 'compiler/dex/quick/quick_compiler.cc')
| -rw-r--r-- | compiler/dex/quick/quick_compiler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/dex/quick/quick_compiler.cc b/compiler/dex/quick/quick_compiler.cc index 1cd742abac..c2fe5538b7 100644 --- a/compiler/dex/quick/quick_compiler.cc +++ b/compiler/dex/quick/quick_compiler.cc @@ -37,6 +37,7 @@ #include "driver/compiler_driver.h" #include "driver/compiler_options.h" #include "elf_writer_quick.h" +#include "experimental_flags.h" #include "jni/quick/jni_compiler.h" #include "mir_to_lir.h" #include "mirror/object.h" @@ -523,7 +524,8 @@ static bool SkipScanningUnsupportedOpcodes(InstructionSet instruction_set) { // All opcodes are supported no matter what. Usually not the case // since experimental opcodes are not implemented in the quick compiler. return true; - } else if (LIKELY(!Runtime::Current()->AreExperimentalLambdasEnabled())) { + } else if (LIKELY(!Runtime::Current()-> + AreExperimentalFlagsEnabled(ExperimentalFlags::kLambdas))) { // Experimental opcodes are disabled. // // If all unsupported opcodes are experimental we don't need to do scanning. |