Fox issue 2108: throw illegal argument exception for RegExp natives. Continue throwin NPE where exp…

runtime/lib/regexp.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/assert.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/exceptions.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 
 #include "lib/regexp_jsc.h"
 
 namespace dart {
 
 static void CheckAndThrowExceptionIfNull(const Instance& obj) {
   if (obj.IsNull()) {
     GrowableArray<const Object*> args;
     Exceptions::ThrowByType(Exceptions::kNullPointer, args);
   }
 }
 
 
 DEFINE_NATIVE_ENTRY(JSSyntaxRegExp_factory, 4) {
   ASSERT(AbstractTypeArguments::CheckedHandle(arguments->At(0)).IsNull());
-  const String& pattern = String::CheckedHandle(arguments->At(1));
-  CheckAndThrowExceptionIfNull(pattern);
-  const Instance& handle_multi_line = Instance::CheckedHandle(arguments->At(2));
-  const Instance& handle_ignore_case =
-      Instance::CheckedHandle(arguments->At(3));
+  const Instance& arg1 = Instance::CheckedHandle(arguments->At(1));
+  CheckAndThrowExceptionIfNull(arg1);

[siva, 2012/03/12 18:49:01]

Not sure how many times this comes up where we have to check for Null and proper
type. If there are too many of these we could have a GET_NONNULL_NATIVE_ARGUMENT
macro.

[srdjan, 2012/03/12 19:01:13]

JSSyntaxRegExp are the only place where an illegal argument may throw a NPE.
Maybe we remove this special behavior at some point.

+  GET_NATIVE_ARGUMENT(String, pattern, arguments->At(1));

[siva, 2012/03/12 18:49:01]

Another unrelated question, the macro GET_NATIVE_ARGUMENT
calls CheckedHandle(arg);
if arg is not an instance it results in a FATAL(...).

Should we consider throwing an exception there instead of a FATAL?

[srdjan, 2012/03/12 19:01:13]

Generated code can never pass a non-Instance object. We could make it quicker by
eliminating CheckedHandle and check that the argument is instance in debug mode
only.

+  GET_NATIVE_ARGUMENT(Instance, handle_multi_line, arguments->At(2));
+  GET_NATIVE_ARGUMENT(Instance, handle_ignore_case, arguments->At(3));
   bool ignore_case = handle_ignore_case.raw() == Bool::True();
   bool multi_line = handle_multi_line.raw() == Bool::True();
   const JSRegExp& new_regex = JSRegExp::Handle(
       Jscre::Compile(pattern, multi_line, ignore_case));
   arguments->SetReturn(new_regex);
 }
 
 
 DEFINE_NATIVE_ENTRY(JSSyntaxRegExp_getPattern, 1) {
   const JSRegExp& regexp = JSRegExp::CheckedHandle(arguments->At(0));
@@ skipping 33 matching lines @@
   GrowableArray<const Object*> args;
   args.Add(&pattern);
   args.Add(&errmsg);
   Exceptions::ThrowByType(Exceptions::kIllegalJSRegExp, args);
 }
 
 
 DEFINE_NATIVE_ENTRY(JSSyntaxRegExp_ExecuteMatch, 3) {
   const JSRegExp& regexp = JSRegExp::CheckedHandle(arguments->At(0));
   ASSERT(!regexp.IsNull());
-  const String& str = String::CheckedHandle(arguments->At(1));
-  CheckAndThrowExceptionIfNull(str);
-  const Smi& start_index = Smi::CheckedHandle(arguments->At(2));
+  const Instance& arg1 = Instance::CheckedHandle(arguments->At(1));
+  CheckAndThrowExceptionIfNull(arg1);
+  GET_NATIVE_ARGUMENT(String, str, arguments->At(1));
+  GET_NATIVE_ARGUMENT(Smi, start_index, arguments->At(2));
   const Array& result =
       Array::Handle(Jscre::Execute(regexp, str, start_index.Value()));
   arguments->SetReturn(result);
 }
 
 }  // namespace dart