Skip to content

Commit 4f39519

Browse files
vmaksimovmaksimo
committed
Merge from 'master' to 'sycl-web' (#100)
 CONFLICT (content): Merge conflict in clang/lib/Driver/ToolChains/Clang.cpp
2 parents 6af2069 + e372c1d commit 4f39519

File tree

226 files changed

+6624
-2178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+6624
-2178
lines changed

‎clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ struct UnqualNameVisitor : public RecursiveASTVisitor<UnqualNameVisitor> {
6666
->getName()))
6767
return false;
6868
break;
69+
case TypeLoc::Typedef:
70+
if (VisitUnqualName(
71+
TL.getAs<TypedefTypeLoc>().getTypePtr()->getDecl()->getName()))
72+
return false;
73+
break;
6974
default:
7075
break;
7176
}

‎clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ void FunctionCognitiveComplexityCheck::check(
533533
// Increase, on the other hand, can be 0.
534534

535535
diag(Detail.Loc, Msgs[MsgId], DiagnosticIDs::Note)
536-
<< Increase << Detail.Nesting << 1 + Detail.Nesting;
536+
<< (unsigned)Increase << (unsigned)Detail.Nesting << 1 + Detail.Nesting;
537537
}
538538
}
539539

‎clang-tools-extra/test/clang-tidy/checkers/modernize-use-trailing-return-type.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,16 @@ namespace std {
99

1010
class string;
1111

12-
class ostream;
12+
template <typename T>
13+
class basic_ostream;
14+
15+
using ostream = basic_ostream<char>;
1316

1417
template <typename T>
1518
auto declval() -> T;
19+
20+
template <typename... Ts>
21+
class tuple;
1622
}
1723

1824
//
@@ -527,6 +533,10 @@ std::array<int, Size> j6(unsigned Size);
527533
std::array<decltype(Size), (Size * 2) + 1> j8(unsigned Size);
528534
// CHECK-MESSAGES: :[[@LINE-1]]:44: warning: use a trailing return type for this function [modernize-use-trailing-return-type]
529535
// CHECK-FIXES: {{^}}std::array<decltype(Size), (Size * 2) + 1> j8(unsigned Size);{{$}}
536+
using std::ostream;
537+
std::tuple<int, std::string, ostream>& operator<<(ostream& ostream, float i);
538+
// CHECK-MESSAGES: :[[@LINE-1]]:40: warning: use a trailing return type for this function [modernize-use-trailing-return-type]
539+
// CHECK-FIXES: {{^}}std::tuple<int, std::string, ostream>& operator<<(ostream& ostream, float i);{{$}}
530540

531541
class CC {
532542
int Object;
@@ -552,7 +562,6 @@ Object DD::g() {
552562
// bug 44206, no rewrite should happen due to collision with parameter name
553563
//
554564

555-
using std::ostream;
556565
ostream& operator<<(ostream& ostream, int i);
557566
// CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use a trailing return type for this function [modernize-use-trailing-return-type]
558567
// CHECK-FIXES: {{^}}ostream& operator<<(ostream& ostream, int i);{{$}}

‎clang/include/clang/AST/DeclObjC.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,8 +2178,8 @@ class ObjCProtocolDecl : public ObjCContainerDecl,
21782178
data().ReferencedProtocols.set(List, Num, Locs, C);
21792179
}
21802180

2181-
/// This is true iff the protocol is tagged with the `objc_static_protocol`
2182-
/// attribute.
2181+
/// This is true iff the protocol is tagged with the
2182+
/// `objc_non_runtime_protocol` attribute.
21832183
bool isNonRuntimeProtocol() const;
21842184

21852185
/// Get the set of all protocols implied by this protocols inheritance

‎clang/include/clang/Basic/Builtins.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,7 @@ LIBBUILTIN(pthread_create, "", "fC<2,3>", "pthread.h", ALL_GNU_LANGUAGES)
10281028

10291029
// POSIX setjmp.h
10301030

1031+
// FIXME: MinGW _setjmp has an additional void* parameter.
10311032
LIBBUILTIN(_setjmp, "iJ", "fjT", "setjmp.h", ALL_LANGUAGES)
10321033
LIBBUILTIN(__sigsetjmp, "iSJi", "fjT", "setjmp.h", ALL_LANGUAGES)
10331034
LIBBUILTIN(sigsetjmp, "iSJi", "fjT", "setjmp.h", ALL_LANGUAGES)

‎clang/include/clang/Basic/BuiltinsPPC.def

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,11 @@ BUILTIN(__builtin_vsx_xxeval, "V2ULLiV2ULLiV2ULLiV2ULLiIi", "")
558558

559559
BUILTIN(__builtin_vsx_xvtlsbb, "iV16UcUi", "")
560560

561+
BUILTIN(__builtin_vsx_xvtdivdp, "iV2dV2d", "")
562+
BUILTIN(__builtin_vsx_xvtdivsp, "iV4fV4f", "")
563+
BUILTIN(__builtin_vsx_xvtsqrtdp, "iV2d", "")
564+
BUILTIN(__builtin_vsx_xvtsqrtsp, "iV4f", "")
565+
561566
// P10 Vector Permute Extended built-in.
562567
BUILTIN(__builtin_vsx_xxpermx, "V16UcV16UcV16UcV16UcIi", "")
563568

‎clang/include/clang/Basic/BuiltinsX86.def

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,23 +1901,17 @@ TARGET_BUILTIN(__builtin_ia32_enqcmd, "Ucv*vC*", "n", "enqcmd")
19011901
TARGET_BUILTIN(__builtin_ia32_enqcmds, "Ucv*vC*", "n", "enqcmd")
19021902

19031903
// KEY LOCKER
1904-
TARGET_BUILTIN(__builtin_ia32_loadiwkey, "vUiV2OiV2OiV2Oi", "nV:128:", "kl")
1905-
TARGET_BUILTIN(__builtin_ia32_encodekey128,
1906-
"UiUiV2OiV2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*", "nV:128:", "kl")
1907-
TARGET_BUILTIN(__builtin_ia32_encodekey256,
1908-
"UiUiV2OiV2OiV2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*", "nV:128:", "kl")
1909-
TARGET_BUILTIN(__builtin_ia32_aesenc128kl, "UcV2Oi*V2OivC*", "nV:128:", "kl")
1910-
TARGET_BUILTIN(__builtin_ia32_aesenc256kl, "UcV2Oi*V2OivC*", "nV:128:", "kl")
1911-
TARGET_BUILTIN(__builtin_ia32_aesdec128kl, "UcV2Oi*V2OivC*", "nV:128:", "kl")
1912-
TARGET_BUILTIN(__builtin_ia32_aesdec256kl, "UcV2Oi*V2OivC*", "nV:128:", "kl")
1913-
TARGET_BUILTIN(__builtin_ia32_aesencwide128kl,
1914-
"UcvC*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2OiV2OiV2OiV2OiV2OiV2OiV2OiV2Oi", "nV:128:", "kl,widekl")
1915-
TARGET_BUILTIN(__builtin_ia32_aesencwide256kl,
1916-
"UcvC*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2OiV2OiV2OiV2OiV2OiV2OiV2OiV2Oi", "nV:128:", "kl,widekl")
1917-
TARGET_BUILTIN(__builtin_ia32_aesdecwide128kl,
1918-
"UcvC*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2OiV2OiV2OiV2OiV2OiV2OiV2OiV2Oi", "nV:128:", "kl,widekl")
1919-
TARGET_BUILTIN(__builtin_ia32_aesdecwide256kl,
1920-
"UcvC*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2Oi*V2OiV2OiV2OiV2OiV2OiV2OiV2OiV2Oi", "nV:128:", "kl,widekl")
1904+
TARGET_BUILTIN(__builtin_ia32_loadiwkey, "vV2OiV2OiV2OiUi", "nV:128:", "kl")
1905+
TARGET_BUILTIN(__builtin_ia32_encodekey128_u32, "UiUiV2Oiv*", "nV:128:", "kl")
1906+
TARGET_BUILTIN(__builtin_ia32_encodekey256_u32, "UiUiV2OiV2Oiv*", "nV:128:", "kl")
1907+
TARGET_BUILTIN(__builtin_ia32_aesenc128kl_u8, "UcV2Oi*V2OivC*", "nV:128:", "kl")
1908+
TARGET_BUILTIN(__builtin_ia32_aesenc256kl_u8, "UcV2Oi*V2OivC*", "nV:128:", "kl")
1909+
TARGET_BUILTIN(__builtin_ia32_aesdec128kl_u8, "UcV2Oi*V2OivC*", "nV:128:", "kl")
1910+
TARGET_BUILTIN(__builtin_ia32_aesdec256kl_u8, "UcV2Oi*V2OivC*", "nV:128:", "kl")
1911+
TARGET_BUILTIN(__builtin_ia32_aesencwide128kl_u8, "UcV2Oi*V2OiC*vC*", "nV:128:", "kl,widekl")
1912+
TARGET_BUILTIN(__builtin_ia32_aesencwide256kl_u8, "UcV2Oi*V2OiC*vC*", "nV:128:", "kl,widekl")
1913+
TARGET_BUILTIN(__builtin_ia32_aesdecwide128kl_u8, "UcV2Oi*V2OiC*vC*", "nV:128:", "kl,widekl")
1914+
TARGET_BUILTIN(__builtin_ia32_aesdecwide256kl_u8, "UcV2Oi*V2OiC*vC*", "nV:128:", "kl,widekl")
19211915

19221916
// SERIALIZE
19231917
TARGET_BUILTIN(__builtin_ia32_serialize, "v", "n", "serialize")

‎clang/include/clang/Basic/Cuda.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ const char *CudaVersionToString(CudaVersion V);
3737
CudaVersion CudaStringToVersion(const llvm::Twine &S);
3838

3939
enum class CudaArch {
40+
UNUSED,
4041
UNKNOWN,
4142
SM_20,
4243
SM_21,

‎clang/include/clang/Driver/Options.td

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,9 @@ defm gpu_allow_device_init : OptInFFlag<"gpu-allow-device-init",
692692
def gpu_max_threads_per_block_EQ : Joined<["--"], "gpu-max-threads-per-block=">,
693693
Flags<[CC1Option]>,
694694
HelpText<"Default max threads per block for kernel launch bounds for HIP">;
695+
def gpu_instrument_lib_EQ : Joined<["--"], "gpu-instrument-lib=">,
696+
HelpText<"Instrument device library for HIP, which is a LLVM bitcode containing "
697+
"__cyg_profile_func_enter and __cyg_profile_func_exit">;
695698
def libomptarget_nvptx_path_EQ : Joined<["--"], "libomptarget-nvptx-path=">, Group<i_Group>,
696699
HelpText<"Path to libomptarget-nvptx libraries">;
697700
def dD : Flag<["-"], "dD">, Group<d_Group>, Flags<[CC1Option]>,

‎clang/include/clang/Driver/ToolChain.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,9 +590,6 @@ class ToolChain {
590590
// given compilation arguments.
591591
virtual UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const;
592592

593-
// Detect the highest available version of libc++ in base path.
594-
virtual std::string detectLibcxxIncludePath(StringRef Base) const;
595-
596593
/// AddClangCXXStdlibIncludeArgs - Add the clang -cc1 level arguments to set
597594
/// the include paths to use for the given C++ standard library type.
598595
virtual void

0 commit comments

Comments
 (0)