am ff220f70: Merge "Remove a spurious FIXME and unnecessary type cast."

* commit 'ff220f70036178aa0d7dcf1cbc4825085a84441e':
  Remove a spurious FIXME and unnecessary type cast.
This commit is contained in:
Ben Cheng 2013-05-08 13:26:12 -07:00 committed by Android Git Automerger
commit 49f6e97062

View file

@ -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;