commit 33f768d435dd76eba69632b8e9a5892352dac288
author Googler <no-reply@google.com> Mon Nov 29 10:33:49 2021 +0000
committer Marcel Hlopko <hlopko@google.com> Fri Mar 25 22:02:17 2022 +0000
tree 941c3a41b9e3948a8262802ca1c51ae5ff27c982
parent c0956cf9d08cdf47d95c82ab23b3a966c11bc039

Namespace `lifetime_elision` pragma in `clang` namespace.

PiperOrigin-RevId: 412837730

lifetime_annotations/lifetime_annotations.cc

diff --git a/lifetime_annotations/lifetime_annotations.cc b/lifetime_annotations/lifetime_annotations.cc
index dc5281a..e942ff5 100644
--- a/lifetime_annotations/lifetime_annotations.cc
+++ b/lifetime_annotations/lifetime_annotations.cc
@@ -122,7 +122,7 @@
     std::shared_ptr<LifetimeAnnotationContext> context) {
   // Preprocessor takes ownership of the handler.
   compiler.getPreprocessor().AddPragmaHandler(
-      new LifetimeElisionPragmaHandler(context));
+      "clang", new LifetimeElisionPragmaHandler(context));
 }
 
 }  // namespace devtools_rust

lifetime_annotations/lifetime_annotations_test.cc

diff --git a/lifetime_annotations/lifetime_annotations_test.cc b/lifetime_annotations/lifetime_annotations_test.cc
index 609997f..81938f4 100644
--- a/lifetime_annotations/lifetime_annotations_test.cc
+++ b/lifetime_annotations/lifetime_annotations_test.cc
@@ -87,7 +87,7 @@
 
 TEST_F(LifetimeAnnotationsTest, Failure_NoAnnotationsElisionPragmaInWrongFile) {
   EXPECT_THAT(GetNamedLifetimeAnnotations(R"(
-        #pragma lifetime_elision
+        #pragma clang lifetime_elision
         #include "header.h"
   )",
                                           {std::make_pair("header.h", R"(
@@ -99,7 +99,7 @@
 
 TEST_F(LifetimeAnnotationsTest, LifetimeElision_OneInputLifetime) {
   EXPECT_THAT(GetNamedLifetimeAnnotations(R"(
-        #pragma lifetime_elision
+        #pragma clang lifetime_elision
         int** f(int*);
   )"),
               IsOkAndHolds(LifetimesAre({{"f", "a -> (a, a)"}})));
@@ -107,7 +107,7 @@
 
 TEST_F(LifetimeAnnotationsTest, LifetimeElision_NoOutputLifetimes) {
   EXPECT_THAT(GetNamedLifetimeAnnotations(R"(
-        #pragma lifetime_elision
+        #pragma clang lifetime_elision
         void f(int**, int *);
   )"),
               IsOkAndHolds(LifetimesAre({{"f", "(a, b), c"}})));
@@ -115,7 +115,7 @@
 
 TEST_F(LifetimeAnnotationsTest, LifetimeElision_Templates) {
   EXPECT_THAT(GetNamedLifetimeAnnotations(R"(
-        #pragma lifetime_elision
+        #pragma clang lifetime_elision
         template <class T> class vector {};
         int* f(vector<int *>);
         vector<int*> g(int *);
@@ -125,7 +125,7 @@
 
 TEST_F(LifetimeAnnotationsTest, LifetimeElision_Method) {
   EXPECT_THAT(GetNamedLifetimeAnnotations(R"(
-        #pragma lifetime_elision
+        #pragma clang lifetime_elision
         struct S {
           int** method(int *, int *);
         };
@@ -135,7 +135,7 @@
 
 TEST_F(LifetimeAnnotationsTest, LifetimeElision_FailureTooFewInputLifetimes) {
   EXPECT_THAT(GetNamedLifetimeAnnotations(R"(
-        #pragma lifetime_elision
+        #pragma clang lifetime_elision
         int* f();
   )"),
               StatusIs(absl::StatusCode::kUnknown,
@@ -144,7 +144,7 @@
 
 TEST_F(LifetimeAnnotationsTest, LifetimeElision_FailureTooManyInputLifetimes) {
   EXPECT_THAT(GetNamedLifetimeAnnotations(R"(
-        #pragma lifetime_elision
+        #pragma clang lifetime_elision
         int* f(int**);
   )"),
               StatusIs(absl::StatusCode::kUnknown,