OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08624c5
)
Revert "Pass the verified method to the inlinee DexCompilationUnit."
author
Nicolas Geoffray
<ngeoffray@google.com>
Fri, 7 Aug 2015 15:31:10 +0000
(15:31 +0000)
committer
Nicolas Geoffray
<ngeoffray@google.com>
Fri, 7 Aug 2015 15:31:10 +0000
(15:31 +0000)
Crashes testing libcore on host/x86.
Bug:
22866717
This reverts commit
08624c50f488ecd845e48683e84726ff8c53e6a7
.
Change-Id: Ia8f130d9ea32e171e554bd3e10c44f8453111b52
compiler/optimizing/inliner.cc
patch
|
blob
|
history
diff --git
a/compiler/optimizing/inliner.cc
b/compiler/optimizing/inliner.cc
index
4c74679
..
0106595
100644
(file)
--- a/
compiler/optimizing/inliner.cc
+++ b/
compiler/optimizing/inliner.cc
@@
-276,12
+276,12
@@
bool HInliner::TryBuildAndInline(ArtMethod* resolved_method,
nullptr,
caller_compilation_unit_.GetClassLoader(),
class_linker,
-
callee_dex_file
,
+
*resolved_method->GetDexFile()
,
code_item,
resolved_method->GetDeclaringClass()->GetDexClassDefIndex(),
-
method_index
,
+
resolved_method->GetDexMethodIndex()
,
resolved_method->GetAccessFlags(),
-
compiler_driver_->GetVerifiedMethod(&callee_dex_file, method_index)
);
+
nullptr
);
bool requires_ctor_barrier = false;