Merge WebKit at r59636: Update v8 to r4660.
Will build and run with current webkit.
Change-Id: I57bae621fd894da363ba84e1757ad09eb7c502b9
diff --git a/src/platform-solaris.cc b/src/platform-solaris.cc
index 1fa652d..0d9547b 100644
--- a/src/platform-solaris.cc
+++ b/src/platform-solaris.cc
@@ -233,14 +233,12 @@
int OS::StackWalk(Vector<OS::StackFrame> frames) {
int frames_size = frames.length();
- void** addresses = NewArray<void*>(frames_size);
+ ScopedVector<void*> addresses(frames_size);
- int frames_count = backtrace(addresses, frames_size);
+ int frames_count = backtrace(addresses.start(), frames_size);
- char** symbols;
- symbols = backtrace_symbols(addresses, frames_count);
+ char** symbols = backtrace_symbols(addresses.start(), frames_count);
if (symbols == NULL) {
- DeleteArray(addresses);
return kStackWalkError;
}
@@ -255,7 +253,6 @@
frames[i].text[kStackWalkMaxTextLen - 1] = '\0';
}
- DeleteArray(addresses);
free(symbols);
return frames_count;