commit b3193246902562ea8ab8d2c3214f02b3e711927c
author Douglas Gregor <doug.gregor@gmail.com> Fri Jan 23 00:36:41 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Fri Jan 23 00:36:41 2009 +0000
tree 07d79ad962013eb73d0a1fd29b5d23971e48e919
parent fc1e8ef8cfbeb797ef980cd05789245a045c6633

Support arithmetic on pointer-to-function types as a GNU
extension. Addresses clang PR/3371.




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

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 8cf153e..ab5bd6b 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -2656,12 +2656,25 @@
       // Check for arithmetic on pointers to incomplete types
       if (!PTy->getPointeeType()->isObjectType()) {
         if (PTy->getPointeeType()->isVoidType()) {
+          if (getLangOptions().CPlusPlus) {
+            Diag(Loc, diag::err_typecheck_pointer_arith_void_type)
+              << lex->getSourceRange() << rex->getSourceRange();
+            return QualType();
+          }
+
+          // GNU extension: arithmetic on pointer to void
           Diag(Loc, diag::ext_gnu_void_ptr)
             << lex->getSourceRange() << rex->getSourceRange();
         } else if (PTy->getPointeeType()->isFunctionType()) {
-          Diag(Loc, diag::err_typecheck_pointer_arith_function_type)
+          if (getLangOptions().CPlusPlus) {
+            Diag(Loc, diag::err_typecheck_pointer_arith_function_type)
+              << lex->getType() << lex->getSourceRange();
+            return QualType();
+          }
+
+          // GNU extension: arithmetic on pointer to function
+          Diag(Loc, diag::ext_gnu_ptr_func_arith)
             << lex->getType() << lex->getSourceRange();
-          return QualType();
         } else {
           DiagnoseIncompleteType(Loc, PTy->getPointeeType(), 
                                  diag::err_typecheck_arithmetic_incomplete_type,
@@ -2701,6 +2714,16 @@
       if (lpointee->isVoidType()) {
         Diag(Loc, diag::ext_gnu_void_ptr)
           << lex->getSourceRange() << rex->getSourceRange();
+      } else if (lpointee->isFunctionType()) {
+        if (getLangOptions().CPlusPlus) {
+          Diag(Loc, diag::err_typecheck_pointer_arith_function_type)
+            << lex->getType() << lex->getSourceRange();
+          return QualType();
+        }
+
+        // GNU extension: arithmetic on pointer to function
+        Diag(Loc, diag::ext_gnu_ptr_func_arith)
+          << lex->getType() << lex->getSourceRange();
       } else {
         Diag(Loc, diag::err_typecheck_sub_ptr_object)
           << lex->getType() << lex->getSourceRange();
@@ -3174,10 +3197,22 @@
     if (PT->getPointeeType()->isObjectType()) {
       // Pointer to object is ok!
     } else if (PT->getPointeeType()->isVoidType()) {
-      // Pointer to void is extension.
+      if (getLangOptions().CPlusPlus) {
+        Diag(OpLoc, diag::err_typecheck_pointer_arith_void_type)
+          << Op->getSourceRange();
+        return QualType();
+      }
+
+      // Pointer to void is a GNU extension in C.
       Diag(OpLoc, diag::ext_gnu_void_ptr) << Op->getSourceRange();
     } else if (PT->getPointeeType()->isFunctionType()) {
-      Diag(OpLoc, diag::err_typecheck_pointer_arith_function_type)
+      if (getLangOptions().CPlusPlus) {
+        Diag(OpLoc, diag::err_typecheck_pointer_arith_function_type)
+          << Op->getType() << Op->getSourceRange();
+        return QualType();
+      }
+
+      Diag(OpLoc, diag::ext_gnu_ptr_func_arith)
         << ResType << Op->getSourceRange();
       return QualType();
     } else {