Fix use of deprecated methods removed in V8 7.0

richardlau · richardlau · commit 26f88d05db39 · 2019-01-22T12:15:36.000-05:00
StackFrame::GetFrame(uint32_t index) was deprecated in V8 6.9 and removed in V8 7.0. PR-URL: nodejs#119 Refs: nodejs/node#22531 Refs: nodejs#116 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
diff --git a/src/node_report.cc b/src/node_report.cc
@@ -509,7 +509,11 @@ static void PrintJavaScriptErrorStack(std::ostream& out, Isolate* isolate, Maybe
   }
   // Print the stack trace, samples are not available as the exception isn't from the current stack.
   for (int i = 0; i < stack->GetFrameCount(); i++) {
-    PrintStackFrame(out, isolate, stack->GetFrame(i), i, nullptr);
+    PrintStackFrame(out, isolate, stack->GetFrame(
+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION >= 7)
+                                                  isolate,
+#endif
+                                                  i), i, nullptr);
   }
 }
 
@@ -545,9 +549,17 @@ static void PrintStackFromStackTrace(std::ostream& out, Isolate* isolate, DumpEv
   // Print the stack trace, adding in the pc values from GetStackSample() if available
   for (int i = 0; i < stack->GetFrameCount(); i++) {
     if (static_cast<size_t>(i) < info.frames_count) {
-      PrintStackFrame(out, isolate, stack->GetFrame(i), i, samples[i]);
+      PrintStackFrame(out, isolate, stack->GetFrame(
+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION >= 7)
+                                                    isolate,
+#endif
+                                                    i), i, samples[i]);
     } else {
-      PrintStackFrame(out, isolate, stack->GetFrame(i), i, nullptr);
+      PrintStackFrame(out, isolate, stack->GetFrame(
+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION >= 7)
+                                                    isolate,
+#endif
+                                                    i), i, nullptr);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,11 @@ static void PrintJavaScriptErrorStack(std::ostream& out, Isolate* isolate, Maybe`
`509`	`509`	`}`
`510`	`510`	`// Print the stack trace, samples are not available as the exception isn't from the current stack.`
`511`	`511`	`for (int i = 0; i < stack->GetFrameCount(); i++) {`
`512`		`- PrintStackFrame(out, isolate, stack->GetFrame(i), i, nullptr);`
	`512`	`+ PrintStackFrame(out, isolate, stack->GetFrame(`
	`513`	`+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION >= 7)`
	`514`	`+ isolate,`
	`515`	`+#endif`
	`516`	`+ i), i, nullptr);`
`513`	`517`	`}`
`514`	`518`	`}`
`515`	`519`
`@@ -545,9 +549,17 @@ static void PrintStackFromStackTrace(std::ostream& out, Isolate* isolate, DumpEv`
`545`	`549`	`// Print the stack trace, adding in the pc values from GetStackSample() if available`
`546`	`550`	`for (int i = 0; i < stack->GetFrameCount(); i++) {`
`547`	`551`	`if (static_cast<size_t>(i) < info.frames_count) {`
`548`		`- PrintStackFrame(out, isolate, stack->GetFrame(i), i, samples[i]);`
	`552`	`+ PrintStackFrame(out, isolate, stack->GetFrame(`
	`553`	`+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION >= 7)`
	`554`	`+ isolate,`
	`555`	`+#endif`
	`556`	`+ i), i, samples[i]);`
`549`	`557`	`} else {`
`550`		`- PrintStackFrame(out, isolate, stack->GetFrame(i), i, nullptr);`
	`558`	`+ PrintStackFrame(out, isolate, stack->GetFrame(`
	`559`	`+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION >= 7)`
	`560`	`+ isolate,`
	`561`	`+#endif`
	`562`	`+ i), i, nullptr);`
`551`	`563`	`}`
`552`	`564`	`}`
`553`	`565`	`}`