Merge "Remove a spurious FIXME and unnecessary type cast."

ff220f70 · Ben Cheng · Gerrit Code Review · b9256ada · 63dd03cc · ff220f70
Commit ff220f70 authored 11 years ago by Ben Cheng Committed by Gerrit Code Review 11 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

libc/bionic/debug_stacktrace.cpp libc/bionic/debug_stacktrace.cpp +1 -4

No files found.
--- a/libc/bionic/debug_stacktrace.cpp
+++ b/libc/bionic/debug_stacktrace.cpp
@@ -101,10 +101,7 @@ static _Unwind_Reason_Code trace_function(__unwind_context* context, void* arg)
  if (ip != 0) {
    short* ptr = reinterpret_cast<short*>(ip);
    // Thumb BLX(2)
-
-    // FIXME - GCC 4.7 seems to have a bug as without the unnecessary cast to
-    // short the test will never pass.
-    if ((*(ptr-1) & 0xff80) == (short) 0x4780) {
+    if ((*(ptr-1) & 0xff80) == 0x4780) {
      ip -= 2;
    } else {
      ip -= 4;