azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix backtrace generation for opt builds

Browse Source
This commit is contained in:
Nikolay Igotti
2017-09-12 21:46:07 +03:00
parent e17dd630d6
commit 1366901bae
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/Exceptions.cpp
+4 -2
View File
@@ -135,7 +135,8 @@ OBJ_GETTER0(GetCurrentStackTrace) {
#if USE_GCC_UNWIND #if USE_GCC_UNWIND
int depth = 0; int depth = 0;
_Unwind_Backtrace(depthCountCallback, &depth); _Unwind_Backtrace(depthCountCallback, &depth);
if (depth < kSkipFrames) RETURN_OBJ(nullptr); if (depth < kSkipFrames)
return AllocArrayInstance(theArrayTypeInfo, 0, OBJ_RESULT)
Backtrace result(depth, kSkipFrames); Backtrace result(depth, kSkipFrames);
_Unwind_Backtrace(unwindCallback, &result); _Unwind_Backtrace(unwindCallback, &result);
RETURN_OBJ(result.obj()); RETURN_OBJ(result.obj());
@@ -146,7 +147,8 @@ OBJ_GETTER0(GetCurrentStackTrace) {
int size = backtrace(buffer, maxSize); int size = backtrace(buffer, maxSize);
char** symbols = backtrace_symbols(buffer, size); char** symbols = backtrace_symbols(buffer, size);
RuntimeAssert(symbols != nullptr, "Not enough memory to retrieve the stacktrace"); RuntimeAssert(symbols != nullptr, "Not enough memory to retrieve the stacktrace");
if (size < kSkipFrames) RETURN_OBJ(nullptr); if (size < kSkipFrames)
return AllocArrayInstance(theArrayTypeInfo, 0, OBJ_RESULT);
AutoFree autoFree(symbols); AutoFree autoFree(symbols);
ObjHolder resultHolder; ObjHolder resultHolder;
ObjHeader* result = AllocArrayInstance( ObjHeader* result = AllocArrayInstance(