Don't set both readnone and readonly.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68833 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp
index f3021dce43c7fd816e51c1990db4117cff8b7ebe..bad76409cb1315b7b887312f628565696be6d4d8 100644 (file)
--- a/lib/CodeGen/CGCall.cpp
+++ b/lib/CodeGen/CGCall.cpp
@@ -1654,10 +1654,10 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI,
       FuncAttrs |= llvm::Attribute::NoUnwind;
     if (TargetDecl->getAttr<NoReturnAttr>())
       FuncAttrs |= llvm::Attribute::NoReturn;
-    if (TargetDecl->getAttr<PureAttr>())
-      FuncAttrs |= llvm::Attribute::ReadOnly;
     if (TargetDecl->getAttr<ConstAttr>())
       FuncAttrs |= llvm::Attribute::ReadNone;
+    else if (TargetDecl->getAttr<PureAttr>())
+      FuncAttrs |= llvm::Attribute::ReadOnly;
   }
 
   QualType RetTy = FI.getReturnType();

diff --git a/test/CodeGen/function-attributes.c b/test/CodeGen/function-attributes.c
index 373eb63b700c10fcea92daa7c9da25acf80ace42..a12111ec94acc6f69cedda3ad2c234414e8e657b 100644 (file)
--- a/test/CodeGen/function-attributes.c
+++ b/test/CodeGen/function-attributes.c
@@ -43,4 +43,8 @@ int f12(int arg) {
   return arg ? 0 : f10_t();
 }
 
+// RUN: grep 'define void @f13() nounwind readnone' %t &&
+void f13(void) __attribute__((pure)) __attribute__((const));
+void f13(void){}
+
 // RUN: true