[compiler-rt] r174635 - tsan: fix suppress_java logic

[Dmitry Vyukov]

Author: dvyukov
Date: Thu Feb  7 11:12:28 2013
New Revision: 174635

URL: http://llvm.org/viewvc/llvm-project?rev=174635&view=rev
Log:
tsan: fix suppress_java logic

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc?rev=174635&r1=174634&r2=174635&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_report.cc Thu Feb  7 11:12:28 2013
@@ -521,14 +521,17 @@ static bool IsJavaNonsense(const ReportD
           && frame->module == 0)) {
       return true;
     }
-    frame = SkipTsanInternalFrames(frame);
-    if (frame->next == 0
-        || (frame->func == 0 && frame->file == 0 && frame->line == 0
+    if (FrameIsInternal(frame)) {
+      frame = frame->next;
+      if (frame == 0
+          || (frame->func == 0 && frame->file == 0 && frame->line == 0
           && frame->module == 0)) {
-      CHECK(frame);
-      FiredSuppression supp = {rep->typ, frame->pc};
-      CTX()->fired_suppressions.PushBack(supp);
-      return true;
+        if (frame) {
+          FiredSuppression supp = {rep->typ, frame->pc};
+          CTX()->fired_suppressions.PushBack(supp);
+        }
+        return true;
+      }
     }
   }
 #endif