[llvm-branch-commits] [cfe-branch] r372100 - Merging r371969:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Sep 17 03:19:31 2019
New Revision: 372100

URL: http://llvm.org/viewvc/llvm-project?rev=372100&view=rev
Log:
Merging r371969:
------------------------------------------------------------------------
r371969 | karka | 2019-09-16 11:52:23 +0200 (Mon, 16 Sep 2019) | 13 lines

Change signature of __builtin_rotateright64 back to unsigned

The signature of __builtin_rotateright64 was by misstake changed from
unsigned to signed in r360863, this patch will change it back to
unsigned as intended.

This fixes pr43309

Reviewers: efriedma, hans

Reviewed By: hans

Differential Revision: https://reviews.llvm.org/D67606
------------------------------------------------------------------------

Modified:
    cfe/branches/release_90/   (props changed)
    cfe/branches/release_90/include/clang/Basic/Builtins.def
    cfe/branches/release_90/test/CodeGen/avr-builtins.c

Propchange: cfe/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 17 03:19:31 2019
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:366429,366447-366448,366457,366474,366480,366483,366511,366670,366694,366699,366878,367008,367039,367055,367103,367134,367301,367305,367323,367387,367403,367520,367530,367661,367675,367802,367823,367906,368104,368202,368552,368561,368874,368940,369043,369093,369251,369641,369705,369713,369749,369760,369829,369834,370035,370073,370850,371027,371766
+/cfe/trunk:366429,366447-366448,366457,366474,366480,366483,366511,366670,366694,366699,366878,367008,367039,367055,367103,367134,367301,367305,367323,367387,367403,367520,367530,367661,367675,367802,367823,367906,368104,368202,368552,368561,368874,368940,369043,369093,369251,369641,369705,369713,369749,369760,369829,369834,370035,370073,370850,371027,371766,371969
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_90/include/clang/Basic/Builtins.def
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/include/clang/Basic/Builtins.def?rev=372100&r1=372099&r2=372100&view=diff
==============================================================================
--- cfe/branches/release_90/include/clang/Basic/Builtins.def (original)
+++ cfe/branches/release_90/include/clang/Basic/Builtins.def Tue Sep 17 03:19:31 2019
@@ -440,7 +440,7 @@ BUILTIN(__builtin_rotateleft64, "UWiUWiU
 BUILTIN(__builtin_rotateright8, "UcUcUc", "nc")
 BUILTIN(__builtin_rotateright16, "UsUsUs", "nc")
 BUILTIN(__builtin_rotateright32, "UZiUZiUZi", "nc")
-BUILTIN(__builtin_rotateright64, "UWiUWiWi", "nc")
+BUILTIN(__builtin_rotateright64, "UWiUWiUWi", "nc")
 
 // Random GCC builtins
 BUILTIN(__builtin_constant_p, "i.", "nctu")

Modified: cfe/branches/release_90/test/CodeGen/avr-builtins.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/test/CodeGen/avr-builtins.c?rev=372100&r1=372099&r2=372100&view=diff
==============================================================================
--- cfe/branches/release_90/test/CodeGen/avr-builtins.c (original)
+++ cfe/branches/release_90/test/CodeGen/avr-builtins.c Tue Sep 17 03:19:31 2019
@@ -1,5 +1,9 @@
 // RUN: %clang_cc1 -triple avr-unknown-unknown -emit-llvm -o - %s | FileCheck %s
 
+// Check that the parameter types match. This verifies pr43309.
+// RUN: %clang_cc1 -triple avr-unknown-unknown -Wconversion -verify %s
+// expected-no-diagnostics
+
 unsigned char bitrev8(unsigned char data) {
     return __builtin_bitreverse8(data);
 }