[PATCH] D82984: Revert "[Coroutines] Fix code coverage for coroutine"

[Xun Li via Phabricator via cfe-commits]

lxfind created this revision.
lxfind added reviewers: fhahn, modocache.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
lxfind abandoned this revision.
lxfind added a comment.

Fix up in https://reviews.llvm.org/D82986


This reverts commit 565e37c7702d181804c12d36b6010c513c9b3417 
<https://reviews.llvm.org/rG565e37c7702d181804c12d36b6010c513c9b3417>.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D82984

Files:
  clang/lib/CodeGen/CoverageMappingGen.cpp
  clang/test/CoverageMapping/coroutine.cpp


Index: clang/test/CoverageMapping/coroutine.cpp
===================================================================
--- clang/test/CoverageMapping/coroutine.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcoroutines-ts -std=c++14 
-emit-llvm -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping 
%s | FileCheck %s
-
-namespace std::experimental {
-template <typename... T>
-struct coroutine_traits;
-
-template <class Promise = void>
-struct coroutine_handle {
-  coroutine_handle() = default;
-  static coroutine_handle from_address(void *) noexcept { return {}; }
-};
-template <>
-struct coroutine_handle<void> {
-  static coroutine_handle from_address(void *) { return {}; }
-  coroutine_handle() = default;
-  template <class PromiseType>
-  coroutine_handle(coroutine_handle<PromiseType>) noexcept {}
-};
-} // namespace std::experimental
-
-struct suspend_always {
-  bool await_ready() noexcept;
-  void await_suspend(std::experimental::coroutine_handle<>) noexcept;
-  void await_resume() noexcept;
-};
-
-template <>
-struct std::experimental::coroutine_traits<int, int> {
-  struct promise_type {
-    int get_return_object();
-    suspend_always initial_suspend();
-    suspend_always final_suspend() noexcept;
-    void return_value(int);
-  };
-};
-
-// CHECK-LABEL: _Z2f1i:
-int f1(int x) {       // CHECK-NEXT: File 0, [[@LINE]]:15 -> [[@LINE+7]]:2 = #0
-  if (x > 42) {       // CHECK-NEXT: File 0, [[@LINE]]:7 -> [[@LINE]]:13 = #0
-    ++x;              // CHECK-NEXT: Gap,File 0, [[@LINE-1]]:14 -> 
[[@LINE-1]]:15 = #1
-  } else {            // CHECK-NEXT: File 0, [[@LINE-2]]:15 -> [[@LINE]]:4 = #1
-    co_return x + 42; // CHECK-NEXT: Gap,File 0, [[@LINE-1]]:4 -> 
[[@LINE-1]]:10 = (#0 - #1)
-  }                   // CHECK-NEXT: File 0, [[@LINE-2]]:10 -> [[@LINE]]:4 = 
(#0 - #1)
-  co_return x;        // CHECK-NEXT: Gap,File 0, [[@LINE-1]]:4 -> [[@LINE]]:3 
= #1
-} // CHECK-NEXT: File 0, [[@LINE-1]]:3 -> [[@LINE]]:2 = #1
Index: clang/lib/CodeGen/CoverageMappingGen.cpp
===================================================================
--- clang/lib/CodeGen/CoverageMappingGen.cpp
+++ clang/lib/CodeGen/CoverageMappingGen.cpp
@@ -908,18 +908,6 @@
     terminateRegion(S);
   }
 
-  void VisitCoroutineBodyStmt(const CoroutineBodyStmt *S) {
-    extendRegion(S);
-    Visit(S->getBody());
-  }
-
-  void VisitCoreturnStmt(const CoreturnStmt *S) {
-    extendRegion(S);
-    if (S->getOperand())
-      Visit(S->getOperand());
-    terminateRegion(S);
-  }
-
   void VisitCXXThrowExpr(const CXXThrowExpr *E) {
     extendRegion(E);
     if (E->getSubExpr())



Index: clang/test/CoverageMapping/coroutine.cpp
===================================================================
--- clang/test/CoverageMapping/coroutine.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcoroutines-ts -std=c++14 -emit-llvm -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping %s | FileCheck %s
-
-namespace std::experimental {
-template <typename... T>
-struct coroutine_traits;
-
-template <class Promise = void>
-struct coroutine_handle {
-  coroutine_handle() = default;
-  static coroutine_handle from_address(void *) noexcept { return {}; }
-};
-template <>
-struct coroutine_handle<void> {
-  static coroutine_handle from_address(void *) { return {}; }
-  coroutine_handle() = default;
-  template <class PromiseType>
-  coroutine_handle(coroutine_handle<PromiseType>) noexcept {}
-};
-} // namespace std::experimental
-
-struct suspend_always {
-  bool await_ready() noexcept;
-  void await_suspend(std::experimental::coroutine_handle<>) noexcept;
-  void await_resume() noexcept;
-};
-
-template <>
-struct std::experimental::coroutine_traits<int, int> {
-  struct promise_type {
-    int get_return_object();
-    suspend_always initial_suspend();
-    suspend_always final_suspend() noexcept;
-    void return_value(int);
-  };
-};
-
-// CHECK-LABEL: _Z2f1i:
-int f1(int x) {       // CHECK-NEXT: File 0, [[@LINE]]:15 -> [[@LINE+7]]:2 = #0
-  if (x > 42) {       // CHECK-NEXT: File 0, [[@LINE]]:7 -> [[@LINE]]:13 = #0
-    ++x;              // CHECK-NEXT: Gap,File 0, [[@LINE-1]]:14 -> [[@LINE-1]]:15 = #1
-  } else {            // CHECK-NEXT: File 0, [[@LINE-2]]:15 -> [[@LINE]]:4 = #1
-    co_return x + 42; // CHECK-NEXT: Gap,File 0, [[@LINE-1]]:4 -> [[@LINE-1]]:10 = (#0 - #1)
-  }                   // CHECK-NEXT: File 0, [[@LINE-2]]:10 -> [[@LINE]]:4 = (#0 - #1)
-  co_return x;        // CHECK-NEXT: Gap,File 0, [[@LINE-1]]:4 -> [[@LINE]]:3 = #1
-} // CHECK-NEXT: File 0, [[@LINE-1]]:3 -> [[@LINE]]:2 = #1
Index: clang/lib/CodeGen/CoverageMappingGen.cpp
===================================================================
--- clang/lib/CodeGen/CoverageMappingGen.cpp
+++ clang/lib/CodeGen/CoverageMappingGen.cpp
@@ -908,18 +908,6 @@
     terminateRegion(S);
   }
 
-  void VisitCoroutineBodyStmt(const CoroutineBodyStmt *S) {
-    extendRegion(S);
-    Visit(S->getBody());
-  }
-
-  void VisitCoreturnStmt(const CoreturnStmt *S) {
-    extendRegion(S);
-    if (S->getOperand())
-      Visit(S->getOperand());
-    terminateRegion(S);
-  }
-
   void VisitCXXThrowExpr(const CXXThrowExpr *E) {
     extendRegion(E);
     if (E->getSubExpr())

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits