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:
05dfc65
f290c01
)
Merge "Inline across dex files for JIT."
author
Nicolas Geoffray
<ngeoffray@google.com>
Fri, 3 Feb 2017 09:04:49 +0000
(09:04 +0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Fri, 3 Feb 2017 09:04:50 +0000
(09:04 +0000)
1
2
compiler/optimizing/nodes.h
patch
|
diff1
|
diff2
|
blob
|
history
compiler/optimizing/optimizing_compiler.cc
patch
|
diff1
|
diff2
|
blob
|
history
compiler/optimizing/stack_map_stream.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
compiler/optimizing/nodes.h
Simple merge
diff --cc
compiler/optimizing/optimizing_compiler.cc
Simple merge
diff --cc
compiler/optimizing/stack_map_stream.cc
index
668108d
,
48037b3
..
54614bc
---
1
/
compiler/optimizing/stack_map_stream.cc
---
2
/
compiler/optimizing/stack_map_stream.cc
+++ b/
compiler/optimizing/stack_map_stream.cc
@@@
-16,10
-16,8
+16,11
@@@
#include "stack_map_stream.h"
+#include <unordered_map>
+
+#include "base/stl_util.h"
#include "art_method.h"
+ #include "optimizing/optimizing_compiler.h"
#include "runtime.h"
#include "scoped_thread_state_change-inl.h"