Chromium Code Reviews| Index: src/runtime/runtime.h |
| diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h |
| index 7fb64423d4ccf909f929c826fb90d4b84422606e..2054efbe30a596d068b869d93d7e956cbd30aa7c 100644 |
| --- a/src/runtime/runtime.h |
| +++ b/src/runtime/runtime.h |
| @@ -247,6 +247,8 @@ namespace internal { |
| F(GeneratorGetFunction, 1, 1) \ |
| F(GeneratorGetReceiver, 1, 1) \ |
| F(GeneratorGetInputOrDebugPos, 1, 1) \ |
| + F(GeneratorGetAwaitInput, 1, 1) \ |
| + F(GeneratorSaveInputForAwait, 1, 1) \ |
| F(GeneratorGetContinuation, 1, 1) \ |
| F(GeneratorGetSourcePosition, 1, 1) \ |
| F(GeneratorGetResumeMode, 1, 1) |
| @@ -333,13 +335,15 @@ namespace internal { |
| F(ThrowInvalidStringLength, 0, 1) \ |
| F(ThrowIteratorResultNotAnObject, 1, 1) \ |
| F(ThrowSymbolIteratorInvalid, 0, 1) \ |
| + F(ThrowSymbolAsyncIteratorInvalid, 0, 1) \ |
| F(ThrowNotGeneric, 1, 1) \ |
| F(ThrowReferenceError, 1, 1) \ |
| F(ThrowStackOverflow, 0, 1) \ |
| F(ThrowTypeError, -1 /* >= 1 */, 1) \ |
| F(ThrowUndefinedOrNullToObject, 1, 1) \ |
| F(Typeof, 1, 1) \ |
| - F(UnwindAndFindExceptionHandler, 0, 1) |
| + F(UnwindAndFindExceptionHandler, 0, 1) \ |
| + F(CreateAsyncFromSyncIterator, 1, 1) |
| #define FOR_EACH_INTRINSIC_LITERALS(F) \ |
| F(CreateRegExpLiteral, 4, 1) \ |
| @@ -408,7 +412,7 @@ namespace internal { |
| F(TryMigrateInstance, 1, 1) \ |
| F(IsJSGlobalProxy, 1, 1) \ |
| F(DefineAccessorPropertyUnchecked, 5, 1) \ |
| - F(DefineDataPropertyInLiteral, 6, 1) \ |
| + F(DefineDataPropertyInLiteral, 4, 1) \ |
|
Dan Ehrenberg
2017/01/13 19:41:09
This looks like a broken rebase.
caitp
2017/01/13 20:11:52
didn't get any merge conflicts here last time I re
|
| F(GetDataProperty, 2, 1) \ |
| F(GetConstructorName, 1, 1) \ |
| F(HasFastPackedElements, 1, 1) \ |