Chromium Code Reviews| Index: src/code-stubs.h |
| diff --git a/src/code-stubs.h b/src/code-stubs.h |
| index b08f982bf40abce9db6e14dd42a2e51727783c1a..843fea170d91ef8d93c963b035a090f55e335a8a 100644 |
| --- a/src/code-stubs.h |
| +++ b/src/code-stubs.h |
| @@ -44,7 +44,6 @@ namespace internal { |
| V(BinaryOpIC) \ |
| V(BinaryOpICWithAllocationSite) \ |
| V(BinaryOpWithAllocationSite) \ |
| - V(StringAdd) \ |
| V(NewStringAdd) \ |
|
Hannes Payer (out of office)
2014/01/22 13:05:57
StringAdd?
Benedikt Meurer
2014/01/22 13:16:02
Done.
|
| V(SubString) \ |
| V(StringCompare) \ |
| @@ -447,19 +446,6 @@ class RuntimeCallHelper { |
| }; |
| -// TODO(bmeurer): Move to the StringAddStub declaration once we're |
| -// done with the translation to a hydrogen code stub. |
| -enum StringAddFlags { |
| - // Omit both parameter checks. |
| - STRING_ADD_CHECK_NONE = 0, |
| - // Check left parameter. |
| - STRING_ADD_CHECK_LEFT = 1 << 0, |
| - // Check right parameter. |
| - STRING_ADD_CHECK_RIGHT = 1 << 1, |
| - // Check both parameters. |
| - STRING_ADD_CHECK_BOTH = STRING_ADD_CHECK_LEFT | STRING_ADD_CHECK_RIGHT |
| -}; |
| - |
| } } // namespace v8::internal |
| #if V8_TARGET_ARCH_IA32 |
| @@ -1256,10 +1242,21 @@ class BinaryOpWithAllocationSiteStub V8_FINAL : public BinaryOpICStub { |
| }; |
| -// TODO(bmeurer): Rename to StringAddStub once we dropped the old StringAddStub. |
| -class NewStringAddStub V8_FINAL : public HydrogenCodeStub { |
| +enum StringAddFlags { |
| + // Omit both parameter checks. |
| + STRING_ADD_CHECK_NONE = 0, |
| + // Check left parameter. |
| + STRING_ADD_CHECK_LEFT = 1 << 0, |
| + // Check right parameter. |
| + STRING_ADD_CHECK_RIGHT = 1 << 1, |
| + // Check both parameters. |
| + STRING_ADD_CHECK_BOTH = STRING_ADD_CHECK_LEFT | STRING_ADD_CHECK_RIGHT |
| +}; |
| + |
| + |
| +class StringAddStub V8_FINAL : public HydrogenCodeStub { |
| public: |
| - NewStringAddStub(StringAddFlags flags, PretenureFlag pretenure_flag) |
| + StringAddStub(StringAddFlags flags, PretenureFlag pretenure_flag) |
| : bit_field_(StringAddFlagsBits::encode(flags) | |
| PretenureFlagBits::encode(pretenure_flag)) {} |
| @@ -1297,7 +1294,7 @@ class NewStringAddStub V8_FINAL : public HydrogenCodeStub { |
| virtual void PrintBaseName(StringStream* stream) V8_OVERRIDE; |
| - DISALLOW_COPY_AND_ASSIGN(NewStringAddStub); |
| + DISALLOW_COPY_AND_ASSIGN(StringAddStub); |
| }; |