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/art_method.cc | |
| 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/art_method.cc')
| -rw-r--r-- | runtime/art_method.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/art_method.cc b/runtime/art_method.cc index 478a87ef70..16c099d31a 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -424,7 +424,8 @@ void ArtMethod::Invoke(Thread* self, uint32_t* args, uint32_t args_size, JValue* // exception was thrown to force the activations to be removed from the // stack. Continue execution in the interpreter. self->ClearException(); - ShadowFrame* shadow_frame = self->PopStackedShadowFrame(kDeoptimizationShadowFrame); + ShadowFrame* shadow_frame = + self->PopStackedShadowFrame(StackedShadowFrameType::kDeoptimizationShadowFrame); result->SetJ(self->PopDeoptimizationReturnValue().GetJ()); self->SetTopOfStack(nullptr); self->SetTopOfShadowStack(shadow_frame); |