RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-20 03:23:01 +02:00
Code Issues Projects Releases Wiki Activity

Revert r369549 as it broke the bots.

Browse Source 
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/13605/

llvm-svn: 369569
This commit is contained in:
Aaron Ballman 2019-08-21 20:00:41 +00:00
parent 703d55e86d
commit 6f679d264d
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/Support/Compiler.h
View File

@ -16,9 +16,7 @@
#include "llvm/Config/llvm-config.h" #include "llvm/Config/llvm-config.h"
#ifdef __cplusplus
#include <new> #include <new>
#endif
#include <stddef.h> #include <stddef.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -254,8 +252,10 @@
#define LLVM_FALLTHROUGH [[fallthrough]] #define LLVM_FALLTHROUGH [[fallthrough]]
#elif __has_cpp_attribute(gnu::fallthrough) #elif __has_cpp_attribute(gnu::fallthrough)
#define LLVM_FALLTHROUGH [[gnu::fallthrough]] #define LLVM_FALLTHROUGH [[gnu::fallthrough]]
#elif !defined(__cplusplus) && __has_attribute(fallthrough) #elif !__cplusplus
#define LLVM_FALLTHROUGH __attribute__((fallthrough)) // Workaround for llvm.org/PR23435, since clang 3.6 and below emit a spurious
// error when __has_cpp_attribute is given a scoped attribute in C mode.
#define LLVM_FALLTHROUGH
#elif __has_cpp_attribute(clang::fallthrough) #elif __has_cpp_attribute(clang::fallthrough)
#define LLVM_FALLTHROUGH [[clang::fallthrough]] #define LLVM_FALLTHROUGH [[clang::fallthrough]]
#else #else
@ -527,7 +527,6 @@ void AnnotateIgnoreWritesEnd(const char *file, int line);
#define LLVM_ENABLE_EXCEPTIONS 1 #define LLVM_ENABLE_EXCEPTIONS 1
#endif #endif
#ifdef __cplusplus
namespace llvm { namespace llvm {
/// Allocate a buffer of memory with the given size and alignment. /// Allocate a buffer of memory with the given size and alignment.
@ -570,5 +569,4 @@ inline void deallocate_buffer(void *Ptr, size_t Size, size_t Alignment) {
} // End namespace llvm } // End namespace llvm
#endif // __cplusplus
#endif #endif

7
lib/Support/regcomp.c
View File

@ -48,7 +48,6 @@
#include "regex2.h" #include "regex2.h"
#include "llvm/Config/config.h" #include "llvm/Config/config.h"
#include "llvm/Support/Compiler.h"
/* character-class table */ /* character-class table */
static struct cclass { static struct cclass {
@ -538,7 +537,7 @@ p_ere_exp(struct parse *p)
break; break;
case '{': /* okay as ordinary except if digit follows */ case '{': /* okay as ordinary except if digit follows */
REQUIRE(!MORE() || !isdigit((uch)PEEK()), REG_BADRPT); REQUIRE(!MORE() || !isdigit((uch)PEEK()), REG_BADRPT);
LLVM_FALLTHROUGH; /* fall through */
default: default:
ordinary(p, c); ordinary(p, c);
break; break;
@ -734,7 +733,7 @@ p_simp_re(struct parse *p,
break; break;
case '*': case '*':
REQUIRE(starordinary, REG_BADRPT); REQUIRE(starordinary, REG_BADRPT);
LLVM_FALLTHROUGH; /* fall through */
default: default:
ordinary(p, (char)c); ordinary(p, (char)c);
break; break;
@ -1636,7 +1635,7 @@ findmust(struct parse *p, struct re_guts *g)
return; return;
} }
} while (OP(s) != O_QUEST && OP(s) != O_CH); } while (OP(s) != O_QUEST && OP(s) != O_CH);
LLVM_FALLTHROUGH; /* fall through */
default: /* things that break a sequence */ default: /* things that break a sequence */
if (newlen > g->mlen) { /* ends one */ if (newlen > g->mlen) { /* ends one */
start = newstart; start = newstart;