| Index: src/full-codegen/x87/full-codegen-x87.cc
|
| diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc
|
| index d0e0b3d52e74e23320d9256d8ee6268eea888ce3..794b15f298855fae6dc4e9f3df78161f4b1542b9 100644
|
| --- a/src/full-codegen/x87/full-codegen-x87.cc
|
| +++ b/src/full-codegen/x87/full-codegen-x87.cc
|
| @@ -17,8 +17,7 @@
|
| namespace v8 {
|
| namespace internal {
|
|
|
| -#define __ ACCESS_MASM(masm_)
|
| -
|
| +#define __ ACCESS_MASM(masm())
|
|
|
| class JumpPatchSite BASE_EMBEDDED {
|
| public:
|
| @@ -68,6 +67,7 @@ class JumpPatchSite BASE_EMBEDDED {
|
| __ j(cc, target, distance);
|
| }
|
|
|
| + MacroAssembler* masm() { return masm_; }
|
| MacroAssembler* masm_;
|
| Label patch_site_;
|
| #ifdef DEBUG
|
| @@ -1873,8 +1873,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| case Yield::kFinal: {
|
| // Pop value from top-of-stack slot, box result into result register.
|
| EmitCreateIteratorResult(true);
|
| - EmitUnwindBeforeReturn();
|
| - EmitReturnSequence();
|
| + EmitUnwindAndReturn();
|
| break;
|
| }
|
|
|
|
|