summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2015-10-20 12:36:24 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-10-20 12:36:24 +0000
commit620021e643518dc93dc618d3e9df1c33ff8a491c (patch)
treea97c508946ad8910386343b33f76e46af8ea87c6
parent4206af2185bd1d3d0356a8fbc7c5e151fdd261d5 (diff)
parentab60b68183cc8052b113c566f4851263444eb29c (diff)
Merge "New attempt at fixing mac build."
-rw-r--r--runtime/utils.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/utils.cc b/runtime/utils.cc
index 8083446ce1..62af380219 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -1090,7 +1090,6 @@ static void Addr2line(const std::string& map_src, uintptr_t offset, std::ostream
map_src.c_str(), offset));
RunCommand(cmdline.c_str(), &os, prefix);
}
-#endif
static bool PcIsWithinQuickCode(ArtMethod* method, uintptr_t pc) NO_THREAD_SAFETY_ANALYSIS {
uintptr_t code = reinterpret_cast<uintptr_t>(EntryPointToCodePointer(
@@ -1101,6 +1100,7 @@ static bool PcIsWithinQuickCode(ArtMethod* method, uintptr_t pc) NO_THREAD_SAFET
uintptr_t code_size = reinterpret_cast<const OatQuickMethodHeader*>(code)[-1].code_size_;
return code <= pc && pc <= (code + code_size);
}
+#endif
void DumpNativeStack(std::ostream& os, pid_t tid, const char* prefix,
ArtMethod* current_method, void* ucontext_ptr) {