Title: [210136] trunk/Source/_javascript_Core
- Revision
- 210136
- Author
- [email protected]
- Date
- 2016-12-23 11:01:32 -0800 (Fri, 23 Dec 2016)
Log Message
Fix broken LLINT_SLOW_PATH_TRACING build.
https://bugs.webkit.org/show_bug.cgi?id=166463
Reviewed by Keith Miller.
* llint/LLIntExceptions.cpp:
(JSC::LLInt::returnToThrow):
(JSC::LLInt::callToThrow):
* runtime/CommonSlowPathsExceptions.cpp:
(JSC::CommonSlowPaths::interpreterThrowInCaller):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (210135 => 210136)
--- trunk/Source/_javascript_Core/ChangeLog 2016-12-23 18:16:42 UTC (rev 210135)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-12-23 19:01:32 UTC (rev 210136)
@@ -1,3 +1,16 @@
+2016-12-23 Mark Lam <[email protected]>
+
+ Fix broken LLINT_SLOW_PATH_TRACING build.
+ https://bugs.webkit.org/show_bug.cgi?id=166463
+
+ Reviewed by Keith Miller.
+
+ * llint/LLIntExceptions.cpp:
+ (JSC::LLInt::returnToThrow):
+ (JSC::LLInt::callToThrow):
+ * runtime/CommonSlowPathsExceptions.cpp:
+ (JSC::CommonSlowPaths::interpreterThrowInCaller):
+
2016-12-22 Keith Miller <[email protected]>
WebAssembly: Make spec-tests/f32.wast.js and spec-tests/f64.wast.js pass
Modified: trunk/Source/_javascript_Core/llint/LLIntExceptions.cpp (210135 => 210136)
--- trunk/Source/_javascript_Core/llint/LLIntExceptions.cpp 2016-12-23 18:16:42 UTC (rev 210135)
+++ trunk/Source/_javascript_Core/llint/LLIntExceptions.cpp 2016-12-23 19:01:32 UTC (rev 210136)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,6 +33,10 @@
#include "LowLevelInterpreter.h"
#include "JSCInlines.h"
+#if LLINT_SLOW_PATH_TRACING
+#include "Exception.h"
+#endif
+
namespace JSC { namespace LLInt {
Instruction* returnToThrowForThrownException(ExecState* exec)
@@ -47,7 +51,7 @@
#if LLINT_SLOW_PATH_TRACING
VM* vm = &exec->vm();
auto scope = DECLARE_THROW_SCOPE(*vm);
- dataLog("Throwing exception ", scope.exception(), " (returnToThrow).\n");
+ dataLog("Throwing exception ", JSValue(scope.exception()), " (returnToThrow).\n");
#endif
return LLInt::exceptionInstructions();
}
@@ -58,7 +62,7 @@
#if LLINT_SLOW_PATH_TRACING
VM* vm = &exec->vm();
auto scope = DECLARE_THROW_SCOPE(*vm);
- dataLog("Throwing exception ", scope.exception(), " (callToThrow).\n");
+ dataLog("Throwing exception ", JSValue(scope.exception()), " (callToThrow).\n");
#endif
return LLInt::getCodePtr(llint_throw_during_call_trampoline);
}
Modified: trunk/Source/_javascript_Core/runtime/CommonSlowPathsExceptions.cpp (210135 => 210136)
--- trunk/Source/_javascript_Core/runtime/CommonSlowPathsExceptions.cpp 2016-12-23 18:16:42 UTC (rev 210135)
+++ trunk/Source/_javascript_Core/runtime/CommonSlowPathsExceptions.cpp 2016-12-23 19:01:32 UTC (rev 210136)
@@ -33,6 +33,10 @@
#include "LLIntCommon.h"
#include "JSCInlines.h"
+#if LLINT_SLOW_PATH_TRACING
+#include "Exception.h"
+#endif
+
namespace JSC { namespace CommonSlowPaths {
void interpreterThrowInCaller(ExecState* exec, JSObject* error)
@@ -43,7 +47,7 @@
throwException(exec, scope, error);
#if LLINT_SLOW_PATH_TRACING
- dataLog("Throwing exception ", scope.exception(), ".\n");
+ dataLog("Throwing exception ", JSValue(scope.exception()), ".\n");
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
