summaryrefslogtreecommitdiff
path: root/deps/v8/src/messages.js
diff options
context:
space:
mode:
Diffstat (limited to 'deps/v8/src/messages.js')
-rw-r--r--deps/v8/src/messages.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/deps/v8/src/messages.js b/deps/v8/src/messages.js
index 733fe95e2f..e9f1ae46c2 100644
--- a/deps/v8/src/messages.js
+++ b/deps/v8/src/messages.js
@@ -120,7 +120,7 @@ var kMessages = {
invalid_string_length: ["Invalid string length"],
invalid_typed_array_offset: ["Start offset is too large:"],
invalid_typed_array_length: ["Invalid typed array length"],
- invalid_typed_array_alignment: ["%0", " of ", "%1", " should be a multiple of ", "%2"],
+ invalid_typed_array_alignment: ["%0", "of", "%1", "should be a multiple of", "%3"],
typed_array_set_source_too_large:
["Source is too large"],
typed_array_set_negative_offset:
@@ -939,10 +939,14 @@ function CallSiteToString() {
if (this.isNative()) {
fileLocation = "native";
} else {
- fileName = this.getScriptNameOrSourceURL();
- if (!fileName && this.isEval()) {
- fileLocation = this.getEvalOrigin();
- fileLocation += ", "; // Expecting source position to follow.
+ if (this.isEval()) {
+ fileName = this.getScriptNameOrSourceURL();
+ if (!fileName) {
+ fileLocation = this.getEvalOrigin();
+ fileLocation += ", "; // Expecting source position to follow.
+ }
+ } else {
+ fileName = this.getFileName();
}
if (fileName) {