Make `String.prototype.contains` throw when passing a regular expression

src/harmony-string.js

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 35 matching lines @@
 
   var elements = new InternalArray(n);
   for (var i = 0; i < n; i++) {
     elements[i] = s;
   }
 
   return %StringBuilderConcat(elements, n, "");
 }
 
 
-// ES6 draft 01-20-14, section 21.1.3.18
+// ES6 draft 04-05-14, section 21.1.3.18
 function StringStartsWith(searchString /* position */) {  // length == 1
   CHECK_OBJECT_COERCIBLE(this, "String.prototype.startsWith");
 
   var s = TO_STRING_INLINE(this);
 
   if (IS_REGEXP(searchString)) {
     throw MakeTypeError("first_argument_not_regexp",
                         ["String.prototype.startsWith"]);
   }
 
   var ss = TO_STRING_INLINE(searchString);
   var pos = 0;
   if (%_ArgumentsLength() > 1) {
     pos = %_Arguments(1);  // position
     pos = ToInteger(pos);
   }
 
   var s_len = s.length;
   var start = MathMin(MathMax(pos, 0), s_len);
   var ss_len = ss.length;
   if (ss_len + start > s_len) {
     return false;
   }
 
   return %StringIndexOf(s, ss, start) === start;
 }
 
 
-// ES6 draft 01-20-14, section 21.1.3.7
+// ES6 draft 04-05-14, section 21.1.3.7
 function StringEndsWith(searchString /* position */) {  // length == 1
   CHECK_OBJECT_COERCIBLE(this, "String.prototype.endsWith");
 
   var s = TO_STRING_INLINE(this);
 
   if (IS_REGEXP(searchString)) {
     throw MakeTypeError("first_argument_not_regexp",
                         ["String.prototype.endsWith"]);
   }
 
@@ skipping 11 matching lines @@
   var ss_len = ss.length;
   var start = end - ss_len;
   if (start < 0) {
     return false;
   }
 
   return %StringLastIndexOf(s, ss, start) === start;
 }
 
 
-// ES6 draft 01-20-14, section 21.1.3.6
+// ES6 draft 04-05-14, section 21.1.3.6
 function StringContains(searchString /* position */) {  // length == 1
   CHECK_OBJECT_COERCIBLE(this, "String.prototype.contains");
 
   var s = TO_STRING_INLINE(this);
+
+  if (IS_REGEXP(searchString)) {
+    throw MakeTypeError("first_argument_not_regexp",
+                        ["String.prototype.contains"]);
+  }
+
   var ss = TO_STRING_INLINE(searchString);
   var pos = 0;
   if (%_ArgumentsLength() > 1) {
     pos = %_Arguments(1);  // position
     pos = ToInteger(pos);
   }
 
   var s_len = s.length;
   var start = MathMin(MathMax(pos, 0), s_len);
   var ss_len = ss.length;
@@ skipping 13 matching lines @@
   // Set up the non-enumerable functions on the String prototype object.
   InstallFunctions($String.prototype, DONT_ENUM, $Array(
     "repeat", StringRepeat,
     "startsWith", StringStartsWith,
     "endsWith", StringEndsWith,
     "contains", StringContains
   ));
 }
 
 ExtendStringPrototype();