diff options
| author | 2014-11-11 12:10:56 +0000 | |
|---|---|---|
| committer | 2014-11-11 12:10:57 +0000 | |
| commit | dbc30bc0e1f0dfcd09cb45ecf883dae51aaf853b (patch) | |
| tree | cef3ac836e99f89b584a0b1174cb578074ccb1fa | |
| parent | 9e68483dd4e01e5d2d1c47ce9dd437d31aeaf2fd (diff) | |
| parent | 5c2555407d823356fb55ea3ffdf281aac00a583e (diff) | |
Merge "Use correct register class for refs"
| -rw-r--r-- | compiler/dex/quick/gen_common.cc | 2 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/compiler/dex/quick/gen_common.cc b/compiler/dex/quick/gen_common.cc index 061ee0747a..9cf601bc37 100644 --- a/compiler/dex/quick/gen_common.cc +++ b/compiler/dex/quick/gen_common.cc @@ -481,7 +481,7 @@ void Mir2Lir::GenFilledNewArray(CallInfo* info) { } else if (!info->is_range) { // TUNING: interleave for (int i = 0; i < elems; i++) { - RegLocation rl_arg = LoadValue(info->args[i], kCoreReg); + RegLocation rl_arg = LoadValue(info->args[i], info->args[i].ref ? kRefReg : kCoreReg); Store32Disp(ref_reg, mirror::Array::DataOffset(component_size).Int32Value() + i * 4, rl_arg.reg); // If the LoadValue caused a temp to be allocated, free it diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index e7a04391b2..455474d9ee 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -295,8 +295,7 @@ endif TEST_ART_BROKEN_NDEBUG_TESTS := # Known broken tests for the default compiler (Quick). -TEST_ART_BROKEN_DEFAULT_RUN_TESTS := \ - 412-new-array +TEST_ART_BROKEN_DEFAULT_RUN_TESTS := ifneq (,$(filter default,$(COMPILER_TYPES))) ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \ |