Title: [89226] trunk/Source/_javascript_Core
- Revision
- 89226
- Author
- oli...@apple.com
- Date
- 2011-06-19 19:57:36 -0700 (Sun, 19 Jun 2011)
Log Message
Minor fix to correct layout test results.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (89225 => 89226)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-20 02:44:31 UTC (rev 89225)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-20 02:57:36 UTC (rev 89226)
@@ -1,3 +1,10 @@
+2011-06-19 Oliver Hunt <oli...@apple.com>
+
+ Minor fix to correct layout test results.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::execute):
+
2011-06-17 Oliver Hunt <oli...@apple.com>
Reviewed by Gavin Barraclough.
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (89225 => 89226)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2011-06-20 02:44:31 UTC (rev 89225)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2011-06-20 02:57:36 UTC (rev 89226)
@@ -770,8 +770,11 @@
case LiteralParser::JSONPPathEntryTypeDot: {
if (i == 0) {
PropertySlot slot(globalObject);
- if (!globalObject->getPropertySlot(callFrame, JSONPPath[i].m_pathEntryName, slot))
- return throwError(callFrame, createUndefinedVariableError(globalObject->globalExec(), JSONPPath[i].m_pathEntryName));
+ if (!globalObject->getPropertySlot(callFrame, JSONPPath[i].m_pathEntryName, slot)) {
+ if (i)
+ return throwError(callFrame, createUndefinedVariableError(globalObject->globalExec(), JSONPPath[i].m_pathEntryName));
+ goto failedJSONP;
+ }
baseObject = slot.getValue(callFrame, JSONPPath[i].m_pathEntryName);
} else
baseObject = baseObject.get(callFrame, JSONPPath[i].m_pathEntryName);
@@ -812,7 +815,7 @@
}
return result;
}
-
+failedJSONP:
JSObject* error = program->compile(callFrame, scopeChain);
if (error)
return checkedReturn(throwError(callFrame, error));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
