OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ce157a6
63dccbb
)
Merge "Store resolved Strings for AOT code in .bss."
author
Vladimir Marko
<vmarko@google.com>
Fri, 30 Sep 2016 14:10:21 +0000
(14:10 +0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Fri, 30 Sep 2016 14:10:21 +0000
(14:10 +0000)
15 files changed:
1
2
compiler/common_compiler_test.cc
patch
|
diff1
|
diff2
|
blob
|
history
compiler/driver/compiled_method_storage_test.cc
patch
|
diff1
|
diff2
|
blob
|
history
compiler/driver/compiler_driver.cc
patch
|
diff1
|
diff2
|
blob
|
history
compiler/driver/compiler_driver.h
patch
|
diff1
|
diff2
|
blob
|
history
compiler/image_test.cc
patch
|
diff1
|
diff2
|
blob
|
history
compiler/jit/jit_compiler.cc
patch
|
diff1
|
diff2
|
blob
|
history
compiler/linker/relative_patcher_test.h
patch
|
diff1
|
diff2
|
blob
|
history
compiler/oat_test.cc
patch
|
diff1
|
diff2
|
blob
|
history
compiler/oat_writer.cc
patch
|
diff1
|
diff2
|
blob
|
history
compiler/optimizing/nodes.cc
patch
|
diff1
|
diff2
|
blob
|
history
compiler/optimizing/nodes.h
patch
|
diff1
|
diff2
|
blob
|
history
compiler/optimizing/sharpening.cc
patch
|
diff1
|
diff2
|
blob
|
history
dex2oat/dex2oat.cc
patch
|
diff1
|
diff2
|
blob
|
history
oatdump/oatdump.cc
patch
|
diff1
|
diff2
|
blob
|
history
runtime/mirror/dex_cache-inl.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
compiler/common_compiler_test.cc
index
b726649
,
60740b6
..
bc8facd
---
1
/
compiler/common_compiler_test.cc
---
2
/
compiler/common_compiler_test.cc
+++ b/
compiler/common_compiler_test.cc
@@@
-174,8
-174,10
+174,9
@@@
void CommonCompilerTest::SetUp()
void CommonCompilerTest::CreateCompilerDriver(Compiler::Kind kind,
InstructionSet isa,
size_t number_of_threads) {
+ compiler_options_->boot_image_ = true;
compiler_driver_.reset(new CompilerDriver(compiler_options_.get(),
verification_results_.get(),
- method_inliner_map_.get(),
kind,
isa,
instruction_set_features_.get(),
diff --cc
compiler/driver/compiled_method_storage_test.cc
Simple merge
diff --cc
compiler/driver/compiler_driver.cc
Simple merge
diff --cc
compiler/driver/compiler_driver.h
Simple merge
diff --cc
compiler/image_test.cc
Simple merge
diff --cc
compiler/jit/jit_compiler.cc
Simple merge
diff --cc
compiler/linker/relative_patcher_test.h
Simple merge
diff --cc
compiler/oat_test.cc
Simple merge
diff --cc
compiler/oat_writer.cc
Simple merge
diff --cc
compiler/optimizing/nodes.cc
Simple merge
diff --cc
compiler/optimizing/nodes.h
Simple merge
diff --cc
compiler/optimizing/sharpening.cc
Simple merge
diff --cc
dex2oat/dex2oat.cc
Simple merge
diff --cc
oatdump/oatdump.cc
Simple merge
diff --cc
runtime/mirror/dex_cache-inl.h
Simple merge