Skip to content
This repository has been archived by the owner on Aug 10, 2021. It is now read-only.

Commit

Permalink
[~] Fix typo in the comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladimir Ivanov committed Jun 19, 2020
1 parent ef2e621 commit 27cb454
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions runtime/src/main/cpp/Exceptions.cpp
Expand Up @@ -179,20 +179,9 @@ OBJ_GETTER(GetStackTraceStrings, KConstRef stackTrace) {
RuntimeCheck(symbols != nullptr, "Not enough memory to retrieve the stacktrace");

for (int index = 0; index < size; ++index) {
<<<<<<< HEAD
auto sourceInfo = getSourceInfo(stackTrace, index);
const char* symbol = symbols[index];
const char* result;
=======
auto sourceInfo = Kotlin_getSourceInfo(*PrimitiveArrayAddressOfElementAt<KNativePtr>(stackTrace->array(), index));
<<<<<<< HEAD
const char *symbol = symbols[index];
const char *result;
>>>>>>> [runtime] Fix possible race in terminate handler
=======
const char* symbol = symbols[index];
const char* result;
>>>>>>> minor: PR feedback
char line[1024];
if (sourceInfo.fileName != nullptr) {
if (sourceInfo.lineNumber != -1) {
Expand Down Expand Up @@ -332,14 +321,14 @@ class TerminateHandler {
// will not reconstruct handler anyway, so let's keep dtor deleted to avoid confusion.
~TerminateHandler() = delete;
public:
/// First call will do the job, all consecuent will do nothing.
/// First call will do the job, all consequent will do nothing.
static void install() {
instance(); // Use side effect of warming up
}
};
} // anon namespace

// Use one public funuction to limit access to the class declaration
// Use one public function to limit access to the class declaration
void SetKonanTerminateHandler() {
TerminateHandler::install();
}
Expand Down

0 comments on commit 27cb454

Please sign in to comment.