averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7408 from hughbe/llvm-fallthrough

Browse Source 
Use relatively new LLVM_FALLLTHROUGH instead of our own SWIFT_FALLTHROUGH
This commit is contained in:
Hugh Bellamy
2017-02-13 17:39:59 +07:00
committed by GitHub
parent 488a884319 f001b7562b
commit cb3bdcc2a3
92 changed files with 161 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/swift/Basic/Fallthrough.h
View File

@@ -1,39 +0,0 @@
//===--- Fallthrough.h - switch fallthrough annotation macro ----*- C++ -*-===//
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
//
//===----------------------------------------------------------------------===//
//
// This file defines a SWIFT_FALLTHROUGH macro to annotate intentional
// fallthrough between switch cases. For compilers that support the
// "clang::fallthrough" attribute, it expands to an empty statement with the
// attribute applied; otherwise, it expands to just an empty statement.
//
//===----------------------------------------------------------------------===//
#ifndef SWIFT_BASIC_FALLTHROUGH_H
#define SWIFT_BASIC_FALLTHROUGH_H
#ifndef __has_attribute
# define __has_attribute(x) 0
#endif
#ifndef __has_cpp_attribute
# define __has_cpp_attribute(x) 0
#endif
#if __has_attribute(fallthrough)
# define SWIFT_FALLTHROUGH [[clang::fallthrough]]
#elif __has_cpp_attribute(clang::fallthrough)
# define SWIFT_FALLTHROUGH [[clang::fallthrough]]
#else
# define SWIFT_FALLTHROUGH
#endif
#endif // SWIFT_BASIC_FALLTHROUGH_H

1
include/swift/Parse/Parser.h
View File

@@ -20,7 +20,6 @@
#include "swift/AST/AST.h"
#include "swift/AST/LayoutConstraint.h"
#include "swift/AST/DiagnosticsParse.h"
#include "swift/Basic/Fallthrough.h"
#include "swift/Basic/OptionSet.h"
#include "swift/Parse/Lexer.h"
#include "swift/Parse/LocalContext.h"