diff options
-rw-r--r-- | clang/include/clang/Basic/Builtins.def | 4 | ||||
-rw-r--r-- | clang/test/CodeGenCXX/ms-intrinsics.cpp | 17 |
2 files changed, 2 insertions, 19 deletions
diff --git a/clang/include/clang/Basic/Builtins.def b/clang/include/clang/Basic/Builtins.def index ce79d4ac963..a9ca9abf50c 100644 --- a/clang/include/clang/Basic/Builtins.def +++ b/clang/include/clang/Basic/Builtins.def @@ -827,11 +827,11 @@ LANGBUILTIN(_interlockedbittestandset_nf, "UcNiD*Ni", "n", ALL_MS_LANGUAGES) LANGBUILTIN(_interlockedbittestandset_rel, "UcNiD*Ni", "n", ALL_MS_LANGUAGES) LANGBUILTIN(__iso_volatile_load8, "ccCD*", "n", ALL_MS_LANGUAGES) LANGBUILTIN(__iso_volatile_load16, "ssCD*", "n", ALL_MS_LANGUAGES) -LANGBUILTIN(__iso_volatile_load32, "LiLiCD*", "n", ALL_MS_LANGUAGES) +LANGBUILTIN(__iso_volatile_load32, "iiCD*", "n", ALL_MS_LANGUAGES) LANGBUILTIN(__iso_volatile_load64, "LLiLLiCD*", "n", ALL_MS_LANGUAGES) LANGBUILTIN(__iso_volatile_store8, "vcD*c", "n", ALL_MS_LANGUAGES) LANGBUILTIN(__iso_volatile_store16, "vsD*s", "n", ALL_MS_LANGUAGES) -LANGBUILTIN(__iso_volatile_store32, "vLiD*Li", "n", ALL_MS_LANGUAGES) +LANGBUILTIN(__iso_volatile_store32, "viD*i", "n", ALL_MS_LANGUAGES) LANGBUILTIN(__iso_volatile_store64, "vLLiD*LLi", "n", ALL_MS_LANGUAGES) LANGBUILTIN(__noop, "i.", "n", ALL_MS_LANGUAGES) LANGBUILTIN(__lzcnt16, "UsUs", "nc", ALL_MS_LANGUAGES) diff --git a/clang/test/CodeGenCXX/ms-intrinsics.cpp b/clang/test/CodeGenCXX/ms-intrinsics.cpp deleted file mode 100644 index 7afa39a97ee..00000000000 --- a/clang/test/CodeGenCXX/ms-intrinsics.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// RUN: %clang_cc1 -fms-compatibility -fsyntax-only %s -verify -// expected-no-diagnostics - -struct S { - mutable long _Spinlock = 0; - void _Unlock() { - __iso_volatile_store32(&_Spinlock, 0); - } - int _Reset() { - long v = __iso_volatile_load32(&_Spinlock); - __iso_volatile_store32(&_Spinlock, 0); - return v; - } -}; - -S s; - |