Index: src/full-codegen/ppc/full-codegen-ppc.cc |
diff --git a/src/full-codegen/ppc/full-codegen-ppc.cc b/src/full-codegen/ppc/full-codegen-ppc.cc |
index 6eb2c2c1532689e30b6c06d6e648d9d4003ea556..b86cae1f77119736bfe7ec52bb7e822e27458b96 100644 |
--- a/src/full-codegen/ppc/full-codegen-ppc.cc |
+++ b/src/full-codegen/ppc/full-codegen-ppc.cc |
@@ -19,7 +19,7 @@ |
namespace v8 { |
namespace internal { |
-#define __ ACCESS_MASM(masm_) |
+#define __ ACCESS_MASM(masm()) |
// A patch site is a location in the code which it is possible to patch. This |
// class has a number of methods to emit the code which is patchable and the |
@@ -74,6 +74,7 @@ class JumpPatchSite BASE_EMBEDDED { |
} |
private: |
+ MacroAssembler* masm() { return masm_; } |
MacroAssembler* masm_; |
Label patch_site_; |
#ifdef DEBUG |
@@ -1902,8 +1903,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
__ bne(&resume); |
__ push(result_register()); |
EmitCreateIteratorResult(true); |
- EmitUnwindBeforeReturn(); |
- EmitReturnSequence(); |
+ EmitUnwindAndReturn(); |
__ bind(&suspend); |
VisitForAccumulatorValue(expr->generator_object()); |
@@ -1933,8 +1933,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; |
} |