Selaa lähdekoodia

LibJS: Don't VERIFY that a function is Regular when executing in AST

By replacing this VERIFY with a thrown Error we no longer crash when
calling a generator function in the AST interpreter. This allows us to
more gracefully handle situation which have not been implemented yet.
In particular this helps the libjs-test262-runner since it can now
continue on to the next tests instead of having the entire process end.
davidot 3 vuotta sitten
vanhempi
commit
9c9aaf4d4f

+ 2 - 2
Userland/Libraries/LibJS/AST.cpp

@@ -3371,11 +3371,11 @@ void ScopeNode::add_hoisted_function(NonnullRefPtr<FunctionDeclaration> declarat
     m_functions_hoistable_with_annexB_extension.append(move(declaration));
 }
 
-Value ImportStatement::execute(Interpreter& interpreter, GlobalObject&) const
+Value ImportStatement::execute(Interpreter& interpreter, GlobalObject& global_object) const
 {
     InterpreterNodeScope node_scope { interpreter, *this };
     dbgln("Modules are not fully supported yet!");
-    TODO();
+    interpreter.vm().throw_exception<InternalError>(global_object, ErrorType::NotImplemented, "'import' in modules");
     return {};
 }
 

+ 2 - 1
Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp

@@ -697,7 +697,8 @@ Completion ECMAScriptFunctionObject::ordinary_call_evaluate_body()
 
         return normal_completion(GeneratorObject::create(global_object(), result, this, vm.running_execution_context().lexical_environment, bytecode_interpreter->snapshot_frame()));
     } else {
-        VERIFY(m_kind != FunctionKind::Generator);
+        if (m_kind != FunctionKind::Regular)
+            return vm.throw_completion<InternalError>(global_object(), ErrorType::NotImplemented, "Non regular function execution in AST interpreter");
         OwnPtr<Interpreter> local_interpreter;
         Interpreter* ast_interpreter = vm.interpreter_if_exists();
 

+ 1 - 0
Userland/Libraries/LibJS/Runtime/ErrorTypes.h

@@ -72,6 +72,7 @@
     M(NotAnObjectOrString, "{} is neither an object nor a string")                                                                      \
     M(NotAString, "{} is not a string")                                                                                                 \
     M(NotASymbol, "{} is not a symbol")                                                                                                 \
+    M(NotImplemented, "TODO({} is not implemented in LibJS)")                                                                           \
     M(NotIterable, "{} is not iterable")                                                                                                \
     M(NotObjectCoercible, "{} cannot be converted to an object")                                                                        \
     M(NotUndefined, "{} is not undefined")                                                                                              \