summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/runtime/Operations.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptCore/runtime/Operations.cpp')
-rw-r--r--Source/JavaScriptCore/runtime/Operations.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/runtime/Operations.cpp b/Source/JavaScriptCore/runtime/Operations.cpp
index b89746f3f..459feb466 100644
--- a/Source/JavaScriptCore/runtime/Operations.cpp
+++ b/Source/JavaScriptCore/runtime/Operations.cpp
@@ -47,13 +47,11 @@ NEVER_INLINE JSValue jsAddSlowCase(CallFrame* callFrame, JSValue v1, JSValue v2)
JSValue p1 = v1.toPrimitive(callFrame);
JSValue p2 = v2.toPrimitive(callFrame);
- if (p1.isString()) {
- return p2.isString()
- ? jsString(callFrame, asString(p1), asString(p2))
- : jsString(callFrame, asString(p1), jsString(callFrame, p2.toString(callFrame)));
- }
+ if (p1.isString())
+ return jsString(callFrame, asString(p1), p2.toString(callFrame));
+
if (p2.isString())
- return jsString(callFrame, jsString(callFrame, p1.toString(callFrame)), asString(p2));
+ return jsString(callFrame, p1.toString(callFrame), asString(p2));
return jsNumber(p1.toNumber(callFrame) + p2.toNumber(callFrame));
}