[compiler-rt] r258314 - Revert "[coverage] Add a test case to cover coverage testing with comdat"

Renato Golin via llvm-commits llvm-commits at lists.llvm.org
Wed Jan 20 06:27:50 PST 2016


Author: rengolin
Date: Wed Jan 20 08:27:50 2016
New Revision: 258314

URL: http://llvm.org/viewvc/llvm-project?rev=258314&view=rev
Log:
Revert "[coverage] Add a test case to cover coverage testing with comdat"

This reverts commit r258255 and r258274, as it was breaking the AArch64 bot.

Removed:
    compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-1.cpp
    compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-2.cpp
    compiler-rt/trunk/test/profile/Inputs/instrprof-comdat.h
    compiler-rt/trunk/test/profile/instrprof-comdat.test

Removed: compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-1.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-1.cpp?rev=258313&view=auto
==============================================================================
--- compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-1.cpp (original)
+++ compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-1.cpp (removed)
@@ -1,17 +0,0 @@
-#include "instrprof-comdat.h"
-int g;
-extern int bar(int);
-
-int main() {
-
-  FOO<int> Foo;
-
-  int Res = Foo.DoIt(10);
-
-  if (Res > 10)
-    g = bar(10);
-  else
-    g = bar(1) + bar(2);
-  return 0;
-}
-

Removed: compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-2.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-2.cpp?rev=258313&view=auto
==============================================================================
--- compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-2.cpp (original)
+++ compiler-rt/trunk/test/profile/Inputs/instrprof-comdat-2.cpp (removed)
@@ -1,12 +0,0 @@
-#include "instrprof-comdat.h"
-
-int bar(int I) {
-
-  FOO<long> Foo;
-  FOO<int> Foo2;
-
-  if (I > 5)
-    return (int)Foo.DoIt(10);
-  else
-    return (int)Foo2.DoIt(I);
-}

Removed: compiler-rt/trunk/test/profile/Inputs/instrprof-comdat.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Inputs/instrprof-comdat.h?rev=258313&view=auto
==============================================================================
--- compiler-rt/trunk/test/profile/Inputs/instrprof-comdat.h (original)
+++ compiler-rt/trunk/test/profile/Inputs/instrprof-comdat.h (removed)
@@ -1,23 +0,0 @@
-// Template instantiations are placed into comdat sections. Check that
-// coverage data from different instantiations are mapped back to the correct
-// source regions.
-
-template <class T> class FOO {
-public:
-  FOO() : t(0) {}
-
-  T DoIt(T ti);
-
-private:
-  T t;
-};
-
-template <class T> T FOO<T>::DoIt(T ti) { // HEADER:  2| [[@LINE]]|template
-  for (T I = 0; I < ti; I++) {            // HEADER: 22| [[@LINE]]|  for (T
-    t += I;                               // HEADER: 20| [[@LINE]]|    t += I;
-    if (I > ti / 2)                       // HEADER: 20| [[@LINE]]|    if (I > ti 
-      t -= 1;                             // HEADER:  8| [[@LINE]]|      t -= 1;
-  }                                       // HEADER: 10| [[@LINE]]|  }
-                                          // HEADER:  1| [[@LINE]]|
-  return t;                               // HEADER:  1| [[@LINE]]|  return t;
-}

Removed: compiler-rt/trunk/test/profile/instrprof-comdat.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-comdat.test?rev=258313&view=auto
==============================================================================
--- compiler-rt/trunk/test/profile/instrprof-comdat.test (original)
+++ compiler-rt/trunk/test/profile/instrprof-comdat.test (removed)
@@ -1,6 +0,0 @@
-RUN: mkdir -p %t.d
-RUN: %clang_profgen -xc++ -o %t.d/comdat -fcoverage-mapping %S/Inputs/instrprof-comdat-1.cpp %S/Inputs/instrprof-comdat-2.cpp
-RUN: LLVM_PROFILE_FILE=%t-comdat.profraw %t.d/comdat
-RUN: llvm-profdata merge -o %t.d/comdat.prof %t-comdat.profraw 
-RUN: llvm-cov show --filename-equivalence --instr-profile=%t.d/comdat.prof %t.d/comdat | FileCheck --check-prefix=HEADER %S/Inputs/instrprof-comdat.h
-




More information about the llvm-commits mailing list