diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-06-09 14:09:14 +0200 |
|---|---|---|
| committer | Mingyao Yang <mingyao@google.com> | 2015-06-18 14:14:29 -0700 |
| commit | bf1fa2ccb5e7409910b99dc46b616e44c66ade68 (patch) | |
| tree | 652b3ae6787c63955b745693da6919407cf5ebf5 /runtime/interpreter | |
| parent | ef484d442a3dcae2cd1842c5be0623f5cf71e4ab (diff) | |
| download | art-bf1fa2ccb5e7409910b99dc46b616e44c66ade68.tar.gz art-bf1fa2ccb5e7409910b99dc46b616e44c66ade68.tar.bz2 art-bf1fa2ccb5e7409910b99dc46b616e44c66ade68.zip | |
Follow up on CL 151605
- Fixes return type of StackedShadowFrameRecord::GetType
- Makes StackedShadowFrameType an enum class (scoped enum)
- Moves DeoptimizationReturnValueRecord and StackedShadowFrameRecord
to thread.cc file and use forward declaration in thread.h header
- Fixes tools/generate-operator-out.py for scoped enum classes.
Bug: 20845490
(cherry picked from commit f795869da0a1fa006fdcdacd8afb6149a63fc1a7)
Change-Id: I6b67e288b1db563699161e58ec2e2330d42dd8f5
Diffstat (limited to 'runtime/interpreter')
| -rw-r--r-- | runtime/interpreter/interpreter_common.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc index 3f2e6db716..86a79cead9 100644 --- a/runtime/interpreter/interpreter_common.cc +++ b/runtime/interpreter/interpreter_common.cc @@ -518,7 +518,7 @@ bool DoCall(ArtMethod* called_method, Thread* self, ShadowFrame& shadow_frame, // We might need to do class loading, which incurs a thread state change to kNative. So // register the shadow frame as under construction and allow suspension again. ScopedStackedShadowFramePusher pusher( - self, new_shadow_frame, kShadowFrameUnderConstruction); + self, new_shadow_frame, StackedShadowFrameType::kShadowFrameUnderConstruction); self->EndAssertNoThreadSuspension(old_cause); // We need to do runtime check on reference assignment. We need to load the shorty |