Reland "[turbofan] inline %StringIteratorPrototype%.next in JSBuiltinReducer"

src/compiler/simplified-operator.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/simplified-operator.h"
 
 #include "src/base/lazy-instance.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator.h"
 #include "src/compiler/types.h"
@@ skipping 318 matching lines @@
          op->opcode() == IrOpcode::kSpeculativeNumberLessThan ||
          op->opcode() == IrOpcode::kSpeculativeNumberLessThanOrEqual);
   return OpParameter<NumberOperationHint>(op);
 }
 
 PretenureFlag PretenureFlagOf(const Operator* op) {
   DCHECK_EQ(IrOpcode::kAllocate, op->opcode());
   return OpParameter<PretenureFlag>(op);
 }
 
+UnicodeEncoding UnicodeEncodingOf(const Operator* op) {
+  DCHECK(op->opcode() == IrOpcode::kStringFromCodePoint);
+  return OpParameter<UnicodeEncoding>(op);

[adamk, 2016/10/07 21:49:04]

This call is failing under the CFI build:

../../src/compiler/operator.h:216:10: runtime error: control flow integrity
check for type 'v8::internal::compiler::Operator1<v8::internal::UnicodeEncoding,
v8::internal::compiler::OpEqualTo<v8::internal::UnicodeEncoding>,
v8::internal::compiler::OpHash<v8::internal::UnicodeEncoding> >' failed during
cast to unrelated type (vtable address 0x000000dff620)
0x000000dff620: note: vtable is of type
'v8::internal::compiler::SimplifiedOperatorGlobalCache::StringFromCodePointOperator<(v8::internal::UnicodeEncoding)0>'
 00 00 00 00  50 08 a8 00 00 00 00 00  b0 32 ad 00 00 00 00 00  80 08 a8 00 00
00 00 00  b0 08 a8 00
              ^ 
    #0 0xacc5d2 in v8::internal::UnicodeEncoding const&
v8::internal::compiler::OpParameter<v8::internal::UnicodeEncoding>(v8::internal::compiler::Operator
const*)
/b/build/slave/linux64-cfi/build/v8/out/Release/../../src/compiler/operator.h:217:9
    #1 0x4a82d8 in
v8::internal::compiler::UnicodeEncodingOf(v8::internal::compiler::Operator
const*)
/b/build/slave/linux64-cfi/build/v8/out/Release/../../src/compiler/simplified-operator.cc:341:10
[snip]

See
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20-%20cfi/builds...
for details. Unclear to me why this fails only for this case and not other calls
of OpParameter() calls, unless those failures are either suppressed or not
covered by tests.

[adamk, 2016/10/07 21:52:26]

Actually, this looks like we just need to make StringFromCodePoint subclass
Operator1 instead of Operator. Will see if I can throw together a fix.

+}
+
 #define PURE_OP_LIST(V)                                          \
   V(BooleanNot, Operator::kNoProperties, 1, 0)                   \
   V(NumberEqual, Operator::kCommutative, 2, 0)                   \
   V(NumberLessThan, Operator::kNoProperties, 2, 0)               \
   V(NumberLessThanOrEqual, Operator::kNoProperties, 2, 0)        \
   V(NumberAdd, Operator::kCommutative, 2, 0)                     \
   V(NumberSubtract, Operator::kNoProperties, 2, 0)               \
   V(NumberMultiply, Operator::kCommutative, 2, 0)                \
   V(NumberDivide, Operator::kNoProperties, 2, 0)                 \
   V(NumberModulus, Operator::kNoProperties, 2, 0)                \
@@ skipping 112 matching lines @@
   struct Name##Operator final : public Operator {                        \
     Name##Operator()                                                     \
         : Operator(IrOpcode::k##Name,                                    \
                    Operator::kFoldable | Operator::kNoThrow, #Name,      \
                    value_input_count, 1, 1, value_output_count, 1, 0) {} \
   };                                                                     \
   Name##Operator k##Name;
   CHECKED_OP_LIST(CHECKED)
 #undef CHECKED
 
+  template <UnicodeEncoding kEncoding>
+  struct StringFromCodePointOperator final : public Operator {
+    StringFromCodePointOperator()
+        : Operator(IrOpcode::kStringFromCodePoint, Operator::kPure,
+                   "StringFromCodePoint", 1, 0, 0, 1, 0, 0) {}
+  };
+  StringFromCodePointOperator<UnicodeEncoding::UTF16>
+      kStringFromCodePointOperatorUTF16;
+  StringFromCodePointOperator<UnicodeEncoding::UTF32>
+      kStringFromCodePointOperatorUTF32;
+
   struct ArrayBufferWasNeuteredOperator final : public Operator {
     ArrayBufferWasNeuteredOperator()
         : Operator(IrOpcode::kArrayBufferWasNeutered, Operator::kEliminatable,
                    "ArrayBufferWasNeutered", 1, 1, 1, 1, 1, 0) {}
   };
   ArrayBufferWasNeuteredOperator kArrayBufferWasNeutered;
 
   template <CheckForMinusZeroMode kMode>
   struct CheckedInt32MulOperator final
       : public Operator1<CheckForMinusZeroMode> {
@@ skipping 266 matching lines @@
 #define STORE_BUFFER(Type, type, TYPE, ctype, size) \
   case kExternal##Type##Array:                      \
     return &cache_.kStoreBuffer##Type;
     TYPED_ARRAYS(STORE_BUFFER)
 #undef STORE_BUFFER
   }
   UNREACHABLE();
   return nullptr;
 }
 
+const Operator* SimplifiedOperatorBuilder::StringFromCodePoint(
+    UnicodeEncoding encoding) {
+  switch (encoding) {
+    case UnicodeEncoding::UTF16:
+      return &cache_.kStringFromCodePointOperatorUTF16;
+    case UnicodeEncoding::UTF32:
+      return &cache_.kStringFromCodePointOperatorUTF32;
+  }
+  UNREACHABLE();
+  return nullptr;
+}
+
 #define SPECULATIVE_NUMBER_BINOP(Name)                                        \
   const Operator* SimplifiedOperatorBuilder::Name(NumberOperationHint hint) { \
     switch (hint) {                                                           \
       case NumberOperationHint::kSignedSmall:                                 \
         return &cache_.k##Name##SignedSmallOperator;                          \
       case NumberOperationHint::kSigned32:                                    \
         return &cache_.k##Name##Signed32Operator;                             \
       case NumberOperationHint::kNumber:                                      \
         return &cache_.k##Name##NumberOperator;                               \
       case NumberOperationHint::kNumberOrOddball:                             \
@@ skipping 21 matching lines @@
                         Operator::kNoDeopt | Operator::kNoThrow | properties,  \
                         #Name, value_input_count, 1, control_input_count,      \
                         output_count, 1, 0, access);                           \
   }
 ACCESS_OP_LIST(ACCESS)
 #undef ACCESS
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8