r290329 - Speculative revert of r290310 to see if that's the change that's making some of

[Richard Smith via cfe-commits]

Author: rsmith
Date: Thu Dec 22 01:24:39 2016
New Revision: 290329

URL: http://llvm.org/viewvc/llvm-project?rev=290329=rev
Log:
Speculative revert of r290310 to see if that's the change that's making some of
the bots unhappy.

Modified:
cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp?rev=290329=290328=290329=diff
==
--- cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp Thu Dec 22 01:24:39 2016
@@ -2059,8 +2059,7 @@ static bool isSameTemplateArg(ASTContext
 ///
 /// \param NTTPType For a declaration template argument, the type of
 /// the non-type template parameter that corresponds to this template
-/// argument. Can be null if no type sugar is available to add to the
-/// type from the template argument.
+/// argument.
 ///
 /// \param Loc The source location to use for the resulting template
 /// argument.
@@ -2076,16 +2075,12 @@ Sema::getTrivialTemplateArgumentLoc(cons
 Arg, Context.getTrivialTypeSourceInfo(Arg.getAsType(), Loc));
 
   case TemplateArgument::Declaration: {
-if (NTTPType.isNull())
-  NTTPType = Arg.getParamTypeForDecl();
 Expr *E = BuildExpressionFromDeclTemplateArgument(Arg, NTTPType, Loc)
   .getAs();
 return TemplateArgumentLoc(TemplateArgument(E), E);
   }
 
   case TemplateArgument::NullPtr: {
-if (NTTPType.isNull())
-  NTTPType = Arg.getNullPtrType();
 Expr *E = BuildExpressionFromDeclTemplateArgument(Arg, NTTPType, Loc)
   .getAs();
 return TemplateArgumentLoc(TemplateArgument(NTTPType, /*isNullPtr*/true),
@@ -2136,13 +2131,31 @@ ConvertDeducedTemplateArgument(Sema ,
TemplateDeductionInfo ,
bool InFunctionTemplate,
SmallVectorImpl ) {
+  // First, for a non-type template parameter type that is
+  // initialized by a declaration, we need the type of the
+  // corresponding non-type template parameter.
+  QualType NTTPType;
+  if (NonTypeTemplateParmDecl *NTTP =
+  dyn_cast(Param)) {
+NTTPType = NTTP->getType();
+if (NTTPType->isDependentType()) {
+  TemplateArgumentList TemplateArgs(TemplateArgumentList::OnStack, Output);
+  NTTPType = S.SubstType(NTTPType,
+ MultiLevelTemplateArgumentList(TemplateArgs),
+ NTTP->getLocation(),
+ NTTP->getDeclName());
+  if (NTTPType.isNull())
+return true;
+}
+  }
+
   auto ConvertArg = [&](DeducedTemplateArgument Arg,
 unsigned ArgumentPackIndex) {
 // Convert the deduced template argument into a template
 // argument that we can check, almost as if the user had written
 // the template argument explicitly.
 TemplateArgumentLoc ArgLoc =
-S.getTrivialTemplateArgumentLoc(Arg, QualType(), Info.getLocation());
+S.getTrivialTemplateArgumentLoc(Arg, NTTPType, Info.getLocation());
 
 // Check the template argument, converting it as necessary.
 return S.CheckTemplateArgument(
@@ -2174,28 +2187,22 @@ ConvertDeducedTemplateArgument(Sema ,
 }
 
 // If the pack is empty, we still need to substitute into the parameter
-// itself, in case that substitution fails.
-if (PackedArgsBuilder.empty()) {
+// itself, in case that substitution fails. For non-type parameters, we did
+// this above. For type parameters, no substitution is ever required.
+auto *TTP = dyn_cast(Param);
+if (TTP && PackedArgsBuilder.empty()) {
+  // Set up a template instantiation context.
   LocalInstantiationScope Scope(S);
-  TemplateArgumentList TemplateArgs(TemplateArgumentList::OnStack, Output);
-  MultiLevelTemplateArgumentList Args(TemplateArgs);
+  Sema::InstantiatingTemplate Inst(S, Template->getLocation(), Template,
+   TTP, Output,
+   Template->getSourceRange());
+  if (Inst.isInvalid())
+return true;
 
-  if (auto *NTTP = dyn_cast(Param)) {
-Sema::InstantiatingTemplate Inst(S, Template->getLocation(), Template,
- NTTP, Output,
- Template->getSourceRange());
-if (Inst.isInvalid() || 
-S.SubstType(NTTP->getType(), Args, NTTP->getLocation(),
-NTTP->getDeclName()).isNull())
-  return true;
-  } else if (auto *TTP = dyn_cast(Param)) {
-Sema::InstantiatingTemplate Inst(S, Template->getLocation(), Template,
- TTP, Output,
- Template->getSourceRange());
-if (Inst.isInvalid() || 

r290326 - [CrashReproducer] Add support for merging -ivfsoverlay

[Bruno Cardoso Lopes via cfe-commits]

Author: bruno
Date: Thu Dec 22 01:06:03 2016
New Revision: 290326

URL: http://llvm.org/viewvc/llvm-project?rev=290326=rev
Log:
[CrashReproducer] Add support for merging -ivfsoverlay

Merge all VFS mapped files inside -ivfsoverlay inputs into the vfs
overlay provided by the crash reproducer. This is the last missing piece
to allow crash reproducers to fully work with user frameworks; when
combined with headermaps, it allows clang to find additional frameworks.

rdar://problem/27913709

Added:
cfe/trunk/test/Modules/crash-vfs-ivfsoverlay.m
Modified:
cfe/trunk/include/clang/Basic/VirtualFileSystem.h
cfe/trunk/include/clang/Frontend/Utils.h
cfe/trunk/lib/Basic/VirtualFileSystem.cpp
cfe/trunk/lib/Frontend/CompilerInstance.cpp
cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp

Modified: cfe/trunk/include/clang/Basic/VirtualFileSystem.h
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/VirtualFileSystem.h?rev=290326=290325=290326=diff
==
--- cfe/trunk/include/clang/Basic/VirtualFileSystem.h (original)
+++ cfe/trunk/include/clang/Basic/VirtualFileSystem.h Thu Dec 22 01:06:03 2016
@@ -362,6 +362,16 @@ struct YAMLVFSEntry {
   std::string RPath;
 };
 
+/// \brief Collect all pairs of  entries from the
+/// \p YAMLFilePath. This is used by the module dependency collector to forward
+/// the entries into the reproducer output VFS YAML file.
+void collectVFSFromYAML(
+std::unique_ptr Buffer,
+llvm::SourceMgr::DiagHandlerTy DiagHandler, StringRef YAMLFilePath,
+SmallVectorImpl ,
+void *DiagContext = nullptr,
+IntrusiveRefCntPtr ExternalFS = getRealFileSystem());
+
 class YAMLVFSWriter {
   std::vector Mappings;
   Optional IsCaseSensitive;

Modified: cfe/trunk/include/clang/Frontend/Utils.h
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/Utils.h?rev=290326=290325=290326=diff
==
--- cfe/trunk/include/clang/Frontend/Utils.h (original)
+++ cfe/trunk/include/clang/Frontend/Utils.h Thu Dec 22 01:06:03 2016
@@ -128,11 +128,11 @@ class ModuleDependencyCollector : public
   llvm::StringMap SymLinkMap;
 
   bool getRealPath(StringRef SrcPath, SmallVectorImpl );
-  std::error_code copyToRoot(StringRef Src);
+  std::error_code copyToRoot(StringRef Src, StringRef Dst = "");
 public:
   StringRef getDest() { return DestDir; }
   bool insertSeen(StringRef Filename) { return Seen.insert(Filename).second; }
-  void addFile(StringRef Filename);
+  void addFile(StringRef Filename, StringRef FileDst = "");
   void addFileMapping(StringRef VPath, StringRef RPath) {
 VFSWriter.addFileMapping(VPath, RPath);
   }

Modified: cfe/trunk/lib/Basic/VirtualFileSystem.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/VirtualFileSystem.cpp?rev=290326=290325=290326=diff
==
--- cfe/trunk/lib/Basic/VirtualFileSystem.cpp (original)
+++ cfe/trunk/lib/Basic/VirtualFileSystem.cpp Thu Dec 22 01:06:03 2016
@@ -887,9 +887,6 @@ private:
   RedirectingFileSystem(IntrusiveRefCntPtr ExternalFS)
   : ExternalFS(std::move(ExternalFS)) {}
 
-  /// \brief Looks up \p Path in \c Roots.
-  ErrorOr lookupPath(const Twine );
-
   /// \brief Looks up the path [Start, End) in \p From, possibly
   /// recursing into the contents of \p From if it is a directory.
   ErrorOr lookupPath(sys::path::const_iterator Start,
@@ -899,6 +896,9 @@ private:
   ErrorOr status(const Twine , Entry *E);
 
 public:
+  /// \brief Looks up \p Path in \c Roots.
+  ErrorOr lookupPath(const Twine );
+
   /// \brief Parses \p Buffer, which is expected to be in YAML format and
   /// returns a virtual file system representing its contents.
   static RedirectingFileSystem *
@@ -1606,6 +1606,47 @@ vfs::getVFSFromYAML(std::unique_ptr ,
+  SmallVectorImpl ) {
+  auto Kind = SrcE->getKind();
+  if (Kind == EK_Directory) {
+auto *DE = dyn_cast(SrcE);
+assert(DE && "Must be a directory");
+for (std::unique_ptr  :
+ llvm::make_range(DE->contents_begin(), DE->contents_end())) {
+  Path.push_back(SubEntry->getName());
+  getVFSEntries(SubEntry.get(), Path, Entries);
+  Path.pop_back();
+}
+return;
+  }
+
+  assert(Kind == EK_File && "Must be a EK_File");
+  auto *FE = dyn_cast(SrcE);
+  assert(FE && "Must be a file");
+  SmallString<128> VPath;
+  for (auto  : Path)
+llvm::sys::path::append(VPath, Comp);
+  Entries.push_back(YAMLVFSEntry(VPath.c_str(), 
FE->getExternalContentsPath()));
+}
+
+void vfs::collectVFSFromYAML(std::unique_ptr Buffer,
+ SourceMgr::DiagHandlerTy DiagHandler,
+ StringRef YAMLFilePath,
+ SmallVectorImpl ,
+ void *DiagContext,
+ 

[PATCH] D27710: [analyzer] Prohibit ExplodedGraph's edges duplicating

[Anna Zaks via Phabricator via cfe-commits]

zaks.anna added a comment.

If this is a common mistake for checker writers, we could consider adding 
assertions that check for this situation. We should make sure that we do not to 
add any release builds overhead. Maybe we could put this check behind NDEBUG or 
ensure that whatever code is added to support the assertion is optimized away.

As Artem points out, the checkers in tree do not create a node for every bug 
reported - there is no reason to do that.


Repository:
  rL LLVM

https://reviews.llvm.org/D27710



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r290319 - Make FormatStyle.GetStyleOfFile test work on MSVC

[Antonio Maiorano via cfe-commits]

Author: amaiorano
Date: Wed Dec 21 23:10:07 2016
New Revision: 290319

URL: http://llvm.org/viewvc/llvm-project?rev=290319=rev
Log:
Make FormatStyle.GetStyleOfFile test work on MSVC

Modify getStyle to use vfs::FileSystem::makeAbsolute just like FS.addFile does,
rather than sys::fs::make_absolute. The latter gets the CWD from the platform,
while the former expects it to be set by the client, causing a mismatch when
converting relative paths to absolute.

Differential Revision: https://reviews.llvm.org/D27971

Modified:
cfe/trunk/lib/Format/Format.cpp
cfe/trunk/unittests/Format/FormatTest.cpp

Modified: cfe/trunk/lib/Format/Format.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=290319=290318=290319=diff
==
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Wed Dec 21 23:10:07 2016
@@ -1917,7 +1917,11 @@ FormatStyle getStyle(StringRef StyleName
   // Look for .clang-format/_clang-format file in the file's parent 
directories.
   SmallString<128> UnsuitableConfigFiles;
   SmallString<128> Path(FileName);
-  llvm::sys::fs::make_absolute(Path);
+  if (std::error_code EC = FS->makeAbsolute(Path)) {
+llvm::errs() << EC.message() << "\n";
+return Style;
+  }
+
   for (StringRef Directory = Path; !Directory.empty();
Directory = llvm::sys::path::parent_path(Directory)) {
 

Modified: cfe/trunk/unittests/Format/FormatTest.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=290319=290318=290319=diff
==
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Dec 21 23:10:07 2016
@@ -10936,10 +10936,6 @@ TEST_F(FormatTest, ArrayAsTemplateType)
 format("auto a = unique_ptr < Foo < Bar>[10]> ;", Spaces));
 }
 
-// Since this test case uses UNIX-style file path. We disable it for MS
-// compiler.
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
-
 TEST(FormatStyle, GetStyleOfFile) {
   vfs::InMemoryFileSystem FS;
   // Test 1: format file in the same directory.
@@ -10967,8 +10963,6 @@ TEST(FormatStyle, GetStyleOfFile) {
   ASSERT_EQ(Style3, getGoogleStyle());
 }
 
-#endif // _MSC_VER
-
 TEST_F(ReplacementTest, FormatCodeAfterReplacements) {
   // Column limit is 20.
   std::string Code = "Type *a =\n"


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r290315 - Sema: print qualified name for overload candidates

[Saleem Abdulrasool via cfe-commits]

Author: compnerd
Date: Wed Dec 21 22:26:57 2016
New Revision: 290315

URL: http://llvm.org/viewvc/llvm-project?rev=290315=rev
Log:
Sema: print qualified name for overload candidates

Print the fully qualified names for the overload candidates.  This makes
it easier to tell what the ambiguity is.  Especially if a template
is instantiated after a using namespace, it will not inherit the
namespace where it was declared.  The specialization will give a message
about a partial order being ambiguous for the same (unqualified) name,
which does not help identify the failure.

Addresses PR31450!

Added:
cfe/trunk/test/SemaCXX/template-ambiguous-overload.cpp
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/lib/Sema/SemaOverload.cpp
cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=290315=290314=290315=diff
==
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Wed Dec 21 22:26:57 
2016
@@ -3318,18 +3318,18 @@ def note_ovl_candidate : Note<"candidate
 "is the implicit copy assignment operator|"
 "is the implicit move assignment operator|"
 "inherited constructor|"
-"inherited constructor }0%1"
-"%select{| has different class%diff{ (expected $ but has $)|}3,4"
-"| has different number of parameters (expected %3 but has %4)"
-"| has type mismatch at %ordinal3 parameter"
-"%diff{ (expected $ but has $)|}4,5"
-"| has different return type%diff{ ($ expected but has $)|}3,4"
+"inherited constructor }0%2"
+"%select{| has different class%diff{ (expected $ but has $)|}4,5"
+"| has different number of parameters (expected %4 but has %5)"
+"| has type mismatch at %ordinal4 parameter"
+"%diff{ (expected $ but has $)|}5,6"
+"| has different return type%diff{ ($ expected but has $)|}4,5"
 "| has different qualifiers (expected "
 "%select{none|const|restrict|const and restrict|volatile|const and 
volatile"
-"|volatile and restrict|const, volatile, and restrict}3 but found "
+"|volatile and restrict|const, volatile, and restrict}4 but found "
 "%select{none|const|restrict|const and restrict|volatile|const and 
volatile"
-"|volatile and restrict|const, volatile, and restrict}4)"
-"| has different exception specification}2">;
+"|volatile and restrict|const, volatile, and restrict}5)"
+"| has different exception specification}3">;
 
 def note_ovl_candidate_inherited_constructor : Note<
 "constructor from base class %0 inherited here">;
@@ -4076,7 +4076,7 @@ def err_function_template_spec_ambiguous
 "function template; explicitly specify%select{| additional}1 template "
 "arguments to identify a particular function template">;
 def note_function_template_spec_matched : Note<
-"function template matches specialization %0">;
+"function template %q0 matches specialization %1">;
 def err_function_template_partial_spec : Error<
 "function template partial specialization is not allowed">;
 
@@ -4214,7 +4214,7 @@ def err_explicit_instantiation_member_fu
 def err_explicit_instantiation_ambiguous : Error<
   "partial ordering for explicit instantiation of %0 is ambiguous">;
 def note_explicit_instantiation_candidate : Note<
-  "explicit instantiation candidate function template here %0">;
+  "explicit instantiation candidate function %q0 template here %1">;
 def err_explicit_instantiation_inline : Error<
   "explicit instantiation cannot be 'inline'">;
 def warn_explicit_instantiation_inline_0x : Warning<

Modified: cfe/trunk/lib/Sema/SemaOverload.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=290315=290314=290315=diff
==
--- cfe/trunk/lib/Sema/SemaOverload.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOverload.cpp Wed Dec 21 22:26:57 2016
@@ -9160,7 +9160,7 @@ void Sema::NoteOverloadCandidate(NamedDe
   std::string FnDesc;
   OverloadCandidateKind K = ClassifyOverloadCandidate(*this, Found, Fn, 
FnDesc);
   PartialDiagnostic PD = PDiag(diag::note_ovl_candidate)
- << (unsigned) K << FnDesc;
+ << (unsigned) K << Fn << FnDesc;
 
   HandleFunctionTypeMismatch(PD, Fn->getType(), DestType);
   Diag(Fn->getLocation(), PD);

Modified: cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp?rev=290315=290314=290315=diff
==
--- cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp Wed Dec 21 22:26:57 2016
@@ -4581,12 +4581,12 @@ 

r290310 - Only substitute into type of non-type template parameter once, rather than

[Richard Smith via cfe-commits]

Author: rsmith
Date: Wed Dec 21 21:52:37 2016
New Revision: 290310

URL: http://llvm.org/viewvc/llvm-project?rev=290310=rev
Log:
Only substitute into type of non-type template parameter once, rather than
twice, in finalization of template argumetn deduction.

Modified:
cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp?rev=290310=290309=290310=diff
==
--- cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp Wed Dec 21 21:52:37 2016
@@ -2059,7 +2059,8 @@ static bool isSameTemplateArg(ASTContext
 ///
 /// \param NTTPType For a declaration template argument, the type of
 /// the non-type template parameter that corresponds to this template
-/// argument.
+/// argument. Can be null if no type sugar is available to add to the
+/// type from the template argument.
 ///
 /// \param Loc The source location to use for the resulting template
 /// argument.
@@ -2075,12 +2076,16 @@ Sema::getTrivialTemplateArgumentLoc(cons
 Arg, Context.getTrivialTypeSourceInfo(Arg.getAsType(), Loc));
 
   case TemplateArgument::Declaration: {
+if (NTTPType.isNull())
+  NTTPType = Arg.getParamTypeForDecl();
 Expr *E = BuildExpressionFromDeclTemplateArgument(Arg, NTTPType, Loc)
   .getAs();
 return TemplateArgumentLoc(TemplateArgument(E), E);
   }
 
   case TemplateArgument::NullPtr: {
+if (NTTPType.isNull())
+  NTTPType = Arg.getNullPtrType();
 Expr *E = BuildExpressionFromDeclTemplateArgument(Arg, NTTPType, Loc)
   .getAs();
 return TemplateArgumentLoc(TemplateArgument(NTTPType, /*isNullPtr*/true),
@@ -2131,31 +2136,13 @@ ConvertDeducedTemplateArgument(Sema ,
TemplateDeductionInfo ,
bool InFunctionTemplate,
SmallVectorImpl ) {
-  // First, for a non-type template parameter type that is
-  // initialized by a declaration, we need the type of the
-  // corresponding non-type template parameter.
-  QualType NTTPType;
-  if (NonTypeTemplateParmDecl *NTTP =
-  dyn_cast(Param)) {
-NTTPType = NTTP->getType();
-if (NTTPType->isDependentType()) {
-  TemplateArgumentList TemplateArgs(TemplateArgumentList::OnStack, Output);
-  NTTPType = S.SubstType(NTTPType,
- MultiLevelTemplateArgumentList(TemplateArgs),
- NTTP->getLocation(),
- NTTP->getDeclName());
-  if (NTTPType.isNull())
-return true;
-}
-  }
-
   auto ConvertArg = [&](DeducedTemplateArgument Arg,
 unsigned ArgumentPackIndex) {
 // Convert the deduced template argument into a template
 // argument that we can check, almost as if the user had written
 // the template argument explicitly.
 TemplateArgumentLoc ArgLoc =
-S.getTrivialTemplateArgumentLoc(Arg, NTTPType, Info.getLocation());
+S.getTrivialTemplateArgumentLoc(Arg, QualType(), Info.getLocation());
 
 // Check the template argument, converting it as necessary.
 return S.CheckTemplateArgument(
@@ -2187,22 +2174,28 @@ ConvertDeducedTemplateArgument(Sema ,
 }
 
 // If the pack is empty, we still need to substitute into the parameter
-// itself, in case that substitution fails. For non-type parameters, we did
-// this above. For type parameters, no substitution is ever required.
-auto *TTP = dyn_cast(Param);
-if (TTP && PackedArgsBuilder.empty()) {
-  // Set up a template instantiation context.
+// itself, in case that substitution fails.
+if (PackedArgsBuilder.empty()) {
   LocalInstantiationScope Scope(S);
-  Sema::InstantiatingTemplate Inst(S, Template->getLocation(), Template,
-   TTP, Output,
-   Template->getSourceRange());
-  if (Inst.isInvalid())
-return true;
-
   TemplateArgumentList TemplateArgs(TemplateArgumentList::OnStack, Output);
-  if (!S.SubstDecl(TTP, S.CurContext,
-   MultiLevelTemplateArgumentList(TemplateArgs)))
-return true;
+  MultiLevelTemplateArgumentList Args(TemplateArgs);
+
+  if (auto *NTTP = dyn_cast(Param)) {
+Sema::InstantiatingTemplate Inst(S, Template->getLocation(), Template,
+ NTTP, Output,
+ Template->getSourceRange());
+if (Inst.isInvalid() || 
+S.SubstType(NTTP->getType(), Args, NTTP->getLocation(),
+NTTP->getDeclName()).isNull())
+  return true;
+  } else if (auto *TTP = dyn_cast(Param)) {
+Sema::InstantiatingTemplate Inst(S, Template->getLocation(), Template,
+ 

r290304 - Driver: remove unnecessary parameter

[Saleem Abdulrasool via cfe-commits]

Author: compnerd
Date: Wed Dec 21 21:09:02 2016
New Revision: 290304

URL: http://llvm.org/viewvc/llvm-project?rev=290304=rev
Log:
Driver: remove unnecessary parameter

We can query the Triple and EffectiveTriple from the ToolChain.  Avoid
passing in the argument and query it in the function.  NFC.

Modified:
cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=290304=290303=290304=diff
==
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Wed Dec 21 21:09:02 2016
@@ -3789,13 +3789,14 @@ static void addPS4ProfileRTArgs(const To
 /// this compile should be using PIC mode or not. Returns a tuple of
 /// (RelocationModel, PICLevel, IsPIE).
 static std::tuple
-ParsePICArgs(const ToolChain , const llvm::Triple ,
- const ArgList ) {
+ParsePICArgs(const ToolChain , const ArgList ) {
+  const llvm::Triple  = ToolChain.getEffectiveTriple();
+  const llvm::Triple  = ToolChain.getTriple();
+
   bool PIE = ToolChain.isPIEDefault();
   bool PIC = PIE || ToolChain.isPICDefault();
   // The Darwin/MachO default to use PIC does not apply when using -static.
-  if (ToolChain.getTriple().isOSBinFormatMachO() &&
-  Args.hasArg(options::OPT_static))
+  if (Triple.isOSBinFormatMachO() && Args.hasArg(options::OPT_static))
 PIE = PIC = false;
   bool IsPICLevelTwo = PIC;
 
@@ -3803,7 +3804,7 @@ ParsePICArgs(const ToolChain ,
   Args.hasArg(options::OPT_mkernel, options::OPT_fapple_kext);
 
   // Android-specific defaults for PIC/PIE
-  if (ToolChain.getTriple().isAndroid()) {
+  if (Triple.isAndroid()) {
 switch (ToolChain.getArch()) {
 case llvm::Triple::arm:
 case llvm::Triple::armeb:
@@ -3829,7 +3830,7 @@ ParsePICArgs(const ToolChain ,
   }
 
   // OpenBSD-specific defaults for PIE
-  if (ToolChain.getTriple().getOS() == llvm::Triple::OpenBSD) {
+  if (Triple.getOS() == llvm::Triple::OpenBSD) {
 switch (ToolChain.getArch()) {
 case llvm::Triple::mips64:
 case llvm::Triple::mips64el:
@@ -3888,7 +3889,7 @@ ParsePICArgs(const ToolChain ,
   // Introduce a Darwin and PS4-specific hack. If the default is PIC, but the
   // PIC level would've been set to level 1, force it back to level 2 PIC
   // instead.
-  if (PIC && (ToolChain.getTriple().isOSDarwin() || 
EffectiveTriple.isPS4CPU()))
+  if (PIC && (Triple.isOSDarwin() || EffectiveTriple.isPS4CPU()))
 IsPICLevelTwo |= ToolChain.isPICDefault();
 
   // This kernel flags are a trump-card: they will disable PIC/PIE
@@ -3901,9 +3902,9 @@ ParsePICArgs(const ToolChain ,
   if (Arg *A = Args.getLastArg(options::OPT_mdynamic_no_pic)) {
 // This is a very special mode. It trumps the other modes, almost no one
 // uses it, and it isn't even valid on any OS but Darwin.
-if (!ToolChain.getTriple().isOSDarwin())
+if (!Triple.isOSDarwin())
   ToolChain.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
-  << A->getSpelling() << ToolChain.getTriple().str();
+  << A->getSpelling() << Triple.str();
 
 // FIXME: Warn when this flag trumps some other PIC or PIE flag.
 
@@ -3933,14 +3934,14 @@ ParsePICArgs(const ToolChain ,
   if (LastROPIArg && LastROPIArg->getOption().matches(options::OPT_fropi)) {
 if (!EmbeddedPISupported)
   ToolChain.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
-  << LastROPIArg->getSpelling() << ToolChain.getTriple().str();
+  << LastROPIArg->getSpelling() << Triple.str();
 ROPI = true;
   }
   Arg *LastRWPIArg = Args.getLastArg(options::OPT_frwpi, 
options::OPT_fno_rwpi);
   if (LastRWPIArg && LastRWPIArg->getOption().matches(options::OPT_frwpi)) {
 if (!EmbeddedPISupported)
   ToolChain.getDriver().Diag(diag::err_drv_unsupported_opt_for_target)
-  << LastRWPIArg->getSpelling() << ToolChain.getTriple().str();
+  << LastRWPIArg->getSpelling() << Triple.str();
 RWPI = true;
   }
 
@@ -3986,8 +3987,7 @@ static void AddAssemblerKPIC(const ToolC
   llvm::Reloc::Model RelocationModel;
   unsigned PICLevel;
   bool IsPIE;
-  std::tie(RelocationModel, PICLevel, IsPIE) =
-  ParsePICArgs(ToolChain, ToolChain.getTriple(), Args);
+  std::tie(RelocationModel, PICLevel, IsPIE) = ParsePICArgs(ToolChain, Args);
 
   if (RelocationModel != llvm::Reloc::Static)
 CmdArgs.push_back("-KPIC");
@@ -4329,7 +4329,7 @@ void Clang::ConstructJob(Compilation ,
   unsigned PICLevel;
   bool IsPIE;
   std::tie(RelocationModel, PICLevel, IsPIE) =
-  ParsePICArgs(getToolChain(), Triple, Args);
+  ParsePICArgs(getToolChain(), Args);
 
   const char *RMName = RelocationModelName(RelocationModel);
 
@@ -7036,7 +7036,7 @@ void ClangAs::ConstructJob(Compilation &
   unsigned PICLevel;
   bool IsPIE;
   std::tie(RelocationModel, PICLevel, IsPIE) =
-  ParsePICArgs(getToolChain(), Triple, 

r290305 - Driver: use the triple to query the arch, not the toolchain

[Saleem Abdulrasool via cfe-commits]

Author: compnerd
Date: Wed Dec 21 21:09:04 2016
New Revision: 290305

URL: http://llvm.org/viewvc/llvm-project?rev=290305=rev
Log:
Driver: use the triple to query the arch, not the toolchain

Although the result is the same, the intent is much more clear this way:
we care about the architecture we are targeting.  NFC.

Modified:
cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=290305=290304=290305=diff
==
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Wed Dec 21 21:09:04 2016
@@ -3805,7 +3805,7 @@ ParsePICArgs(const ToolChain ,
 
   // Android-specific defaults for PIC/PIE
   if (Triple.isAndroid()) {
-switch (ToolChain.getArch()) {
+switch (Triple.getArch()) {
 case llvm::Triple::arm:
 case llvm::Triple::armeb:
 case llvm::Triple::thumb:
@@ -3917,7 +3917,7 @@ ParsePICArgs(const ToolChain ,
   }
 
   bool EmbeddedPISupported;
-  switch (ToolChain.getArch()) {
+  switch (Triple.getArch()) {
 case llvm::Triple::arm:
 case llvm::Triple::armeb:
 case llvm::Triple::thumb:
@@ -3946,9 +3946,8 @@ ParsePICArgs(const ToolChain ,
   }
 
   // ROPI and RWPI are not comaptible with PIC or PIE.
-  if ((ROPI || RWPI) && (PIC || PIE)) {
+  if ((ROPI || RWPI) && (PIC || PIE))
 ToolChain.getDriver().Diag(diag::err_drv_ropi_rwpi_incompatible_with_pic);
-  }
 
   if (PIC)
 return std::make_tuple(llvm::Reloc::PIC_, IsPICLevelTwo ? 2U : 1U, PIE);


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r290303 - Driver: rename parameter to reduce confusion

[Saleem Abdulrasool via cfe-commits]

Author: compnerd
Date: Wed Dec 21 21:09:00 2016
New Revision: 290303

URL: http://llvm.org/viewvc/llvm-project?rev=290303=rev
Log:
Driver: rename parameter to reduce confusion

The parameter to ParsePICOpts passed the effective triple and then used
that in a few places and used the actual triple in others.  This was
slightly confusing.  Rename the parameter to make it more obvious.

Modified:
cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=290303=290302=290303=diff
==
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Wed Dec 21 21:09:00 2016
@@ -3789,10 +3789,8 @@ static void addPS4ProfileRTArgs(const To
 /// this compile should be using PIC mode or not. Returns a tuple of
 /// (RelocationModel, PICLevel, IsPIE).
 static std::tuple
-ParsePICArgs(const ToolChain , const llvm::Triple ,
+ParsePICArgs(const ToolChain , const llvm::Triple ,
  const ArgList ) {
-  // FIXME: why does this code...and so much everywhere else, use both
-  // ToolChain.getTriple() and Triple?
   bool PIE = ToolChain.isPIEDefault();
   bool PIC = PIE || ToolChain.isPICDefault();
   // The Darwin/MachO default to use PIC does not apply when using -static.
@@ -3874,7 +3872,7 @@ ParsePICArgs(const ToolChain ,
 O.matches(options::OPT_fPIE) || O.matches(options::OPT_fPIC);
   } else {
 PIE = PIC = false;
-if (Triple.isPS4CPU()) {
+if (EffectiveTriple.isPS4CPU()) {
   Arg *ModelArg = Args.getLastArg(options::OPT_mcmodel_EQ);
   StringRef Model = ModelArg ? ModelArg->getValue() : "";
   if (Model != "kernel") {
@@ -3890,13 +3888,14 @@ ParsePICArgs(const ToolChain ,
   // Introduce a Darwin and PS4-specific hack. If the default is PIC, but the
   // PIC level would've been set to level 1, force it back to level 2 PIC
   // instead.
-  if (PIC && (ToolChain.getTriple().isOSDarwin() || Triple.isPS4CPU()))
+  if (PIC && (ToolChain.getTriple().isOSDarwin() || 
EffectiveTriple.isPS4CPU()))
 IsPICLevelTwo |= ToolChain.isPICDefault();
 
   // This kernel flags are a trump-card: they will disable PIC/PIE
   // generation, independent of the argument order.
-  if (KernelOrKext && ((!Triple.isiOS() || Triple.isOSVersionLT(6)) &&
-   !Triple.isWatchOS()))
+  if (KernelOrKext &&
+  ((!EffectiveTriple.isiOS() || EffectiveTriple.isOSVersionLT(6)) &&
+   !EffectiveTriple.isWatchOS()))
 PIC = PIE = false;
 
   if (Arg *A = Args.getLastArg(options::OPT_mdynamic_no_pic)) {


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r290297 - Add the alloc_size attribute to clang, attempt 2.

[George Burgess IV via cfe-commits]

Author: gbiv
Date: Wed Dec 21 20:50:20 2016
New Revision: 290297

URL: http://llvm.org/viewvc/llvm-project?rev=290297=rev
Log:
Add the alloc_size attribute to clang, attempt 2.

This is a recommit of r290149, which was reverted in r290169 due to msan
failures. msan was failing because we were calling
`isMostDerivedAnUnsizedArray` on an invalid designator, which caused us
to read uninitialized memory. To fix this, the logic of the caller of
said function was simplified, and we now have a `!Invalid` assert in
`isMostDerivedAnUnsizedArray`, so we can catch this particular bug more
easily in the future.

Fingers crossed that this patch sticks this time. :)

Original commit message:

This patch does three things:
- Gives us the alloc_size attribute in clang, which lets us infer the
  number of bytes handed back to us by malloc/realloc/calloc/any user
  functions that act in a similar manner.
- Teaches our constexpr evaluator that evaluating some `const` variables
  is OK sometimes. This is why we have a change in
  test/SemaCXX/constant-expression-cxx11.cpp and other seemingly
  unrelated tests. Richard Smith okay'ed this idea some time ago in
  person.
- Uniques some Blocks in CodeGen, which was reviewed separately at
  D26410. Lack of uniquing only really shows up as a problem when
  combined with our new eagerness in the face of const.

Added:
cfe/trunk/test/CodeGen/alloc-size.c
cfe/trunk/test/CodeGenCXX/alloc-size.cpp
cfe/trunk/test/Sema/alloc-size.c
Modified:
cfe/trunk/include/clang/Basic/Attr.td
cfe/trunk/include/clang/Basic/AttrDocs.td
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/lib/AST/ExprConstant.cpp
cfe/trunk/lib/CodeGen/CGBlocks.cpp
cfe/trunk/lib/CodeGen/CGCall.cpp
cfe/trunk/lib/CodeGen/CodeGenFunction.h
cfe/trunk/lib/CodeGen/CodeGenModule.h
cfe/trunk/lib/Sema/SemaDeclAttr.cpp
cfe/trunk/test/CodeGenCXX/block-in-ctor-dtor.cpp
cfe/trunk/test/CodeGenCXX/global-init.cpp
cfe/trunk/test/CodeGenOpenCL/cl20-device-side-enqueue.cl
cfe/trunk/test/SemaCXX/constant-expression-cxx11.cpp

Modified: cfe/trunk/include/clang/Basic/Attr.td
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Attr.td?rev=290297=290296=290297=diff
==
--- cfe/trunk/include/clang/Basic/Attr.td (original)
+++ cfe/trunk/include/clang/Basic/Attr.td Wed Dec 21 20:50:20 2016
@@ -780,6 +780,15 @@ def EmptyBases : InheritableAttr, Target
   let Documentation = [EmptyBasesDocs];
 }
 
+def AllocSize : InheritableAttr {
+  let Spellings = [GCC<"alloc_size">];
+  let Subjects = SubjectList<[HasFunctionProto], WarnDiag,
+ "ExpectedFunctionWithProtoType">;
+  let Args = [IntArgument<"ElemSizeParam">, IntArgument<"NumElemsParam", 1>];
+  let TemplateDependent = 1;
+  let Documentation = [AllocSizeDocs];
+}
+
 def EnableIf : InheritableAttr {
   let Spellings = [GNU<"enable_if">];
   let Subjects = SubjectList<[Function]>;

Modified: cfe/trunk/include/clang/Basic/AttrDocs.td
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/AttrDocs.td?rev=290297=290296=290297=diff
==
--- cfe/trunk/include/clang/Basic/AttrDocs.td (original)
+++ cfe/trunk/include/clang/Basic/AttrDocs.td Wed Dec 21 20:50:20 2016
@@ -206,6 +206,44 @@ to enforce the provided alignment assump
   }];
 }
 
+def AllocSizeDocs : Documentation {
+  let Category = DocCatFunction;
+  let Content = [{
+The ``alloc_size`` attribute can be placed on functions that return pointers in
+order to hint to the compiler how many bytes of memory will be available at the
+returned poiner. ``alloc_size`` takes one or two arguments.
+
+- ``alloc_size(N)`` implies that argument number N equals the number of
+  available bytes at the returned pointer.
+- ``alloc_size(N, M)`` implies that the product of argument number N and
+  argument number M equals the number of available bytes at the returned
+  pointer.
+
+Argument numbers are 1-based.
+
+An example of how to use ``alloc_size``
+
+.. code-block:: c
+
+  void *my_malloc(int a) __attribute__((alloc_size(1)));
+  void *my_calloc(int a, int b) __attribute__((alloc_size(1, 2)));
+
+  int main() {
+void *const p = my_malloc(100);
+assert(__builtin_object_size(p, 0) == 100);
+void *const a = my_calloc(20, 5);
+assert(__builtin_object_size(a, 0) == 100);
+  }
+
+.. Note:: This attribute works differently in clang than it does in GCC.
+  Specifically, clang will only trace ``const`` pointers (as above); we give up
+  on pointers that are not marked as ``const``. In the vast majority of cases,
+  this is unimportant, because LLVM has support for the ``alloc_size``
+  attribute. However, this may cause mildly unintuitive behavior when used with
+  other attributes, such as ``enable_if``.
+  }];
+}
+
 def EnableIfDocs : Documentation {
   let Category = 

[PATCH] D28037: [PowerPC, DAGCombiner] Change vec_sl to a << (b % (sizeof(a) * 8)), and fold it back to a << b.

[Tim Shen via Phabricator via cfe-commits]

timshen created this revision.
timshen added reviewers: kbarton, hfinkel, iteratee, echristo, bogner.
timshen added subscribers: llvm-commits, cfe-commits.
Herald added subscribers: amehsan, nemanjai, mehdi_amini.

For a << b (as original vec_sl does), if b >= sizeof(a) * 8, the
behavior is undefined. However, Power instructions do define the
behavior, which is equivalent to a << (b % (sizeof(a) * 8)).

This patch changes altivec.h to use a << (b % (sizeof(a) * 8)), to ensure
the consistent semantic of the instructions. Then it combines
the generated multiple instructions back to a single shift.

This patch handles left shift only. Right shift, on the other hand, is more
complicated, considering arithematic/logical right shift.


https://reviews.llvm.org/D28037

Files:
  clang/lib/Headers/altivec.h
  clang/test/CodeGen/builtins-ppc-altivec.c
  llvm/include/llvm/Target/TargetLowering.h
  llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  llvm/lib/Target/PowerPC/PPCISelLowering.h
  llvm/test/CodeGen/PowerPC/shift_mask.ll

Index: llvm/test/CodeGen/PowerPC/shift_mask.ll
===
--- llvm/test/CodeGen/PowerPC/shift_mask.ll
+++ llvm/test/CodeGen/PowerPC/shift_mask.ll
@@ -5,7 +5,6 @@
 define i8 @test000(i8 %a, i8 %b) {
 ; CHECK-LABEL: test000:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:rlwinm 4, 4, 0, 29, 31
 ; CHECK-NEXT:slw 3, 3, 4
 ; CHECK-NEXT:blr
   %rem = and i8 %b, 7
@@ -16,7 +15,6 @@
 define i16 @test001(i16 %a, i16 %b) {
 ; CHECK-LABEL: test001:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:rlwinm 4, 4, 0, 28, 31
 ; CHECK-NEXT:slw 3, 3, 4
 ; CHECK-NEXT:blr
   %rem = and i16 %b, 15
@@ -27,7 +25,6 @@
 define i32 @test002(i32 %a, i32 %b) {
 ; CHECK-LABEL: test002:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:rlwinm 4, 4, 0, 27, 31
 ; CHECK-NEXT:slw 3, 3, 4
 ; CHECK-NEXT:blr
   %rem = and i32 %b, 31
@@ -38,7 +35,6 @@
 define i64 @test003(i64 %a, i64 %b) {
 ; CHECK-LABEL: test003:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:rlwinm 4, 4, 0, 26, 31
 ; CHECK-NEXT:sld 3, 3, 4
 ; CHECK-NEXT:blr
   %rem = and i64 %b, 63
@@ -49,8 +45,6 @@
 define <16 x i8> @test010(<16 x i8> %a, <16 x i8> %b) {
 ; CHECK-LABEL: test010:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:vspltisb 4, 7
-; CHECK-NEXT:xxland 35, 35, 36
 ; CHECK-NEXT:vslb 2, 2, 3
 ; CHECK-NEXT:blr
   %rem = and <16 x i8> %b, 
@@ -61,8 +55,6 @@
 define <8 x i16> @test011(<8 x i16> %a, <8 x i16> %b) {
 ; CHECK-LABEL: test011:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:vspltish 4, 15
-; CHECK-NEXT:xxland 35, 35, 36
 ; CHECK-NEXT:vslh 2, 2, 3
 ; CHECK-NEXT:blr
   %rem = and <8 x i16> %b, 
@@ -73,10 +65,6 @@
 define <4 x i32> @test012(<4 x i32> %a, <4 x i32> %b) {
 ; CHECK-LABEL: test012:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:vspltisw 4, -16
-; CHECK-NEXT:vspltisw 5, 15
-; CHECK-NEXT:vsubuwm 4, 5, 4
-; CHECK-NEXT:xxland 35, 35, 36
 ; CHECK-NEXT:vslw 2, 2, 3
 ; CHECK-NEXT:blr
   %rem = and <4 x i32> %b, 
@@ -87,11 +75,6 @@
 define <2 x i64> @test013(<2 x i64> %a, <2 x i64> %b) {
 ; CHECK-LABEL: test013:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:addis 3, 2, .LCPI7_0@toc@ha
-; CHECK-NEXT:addi 3, 3, .LCPI7_0@toc@l
-; CHECK-NEXT:lxvd2x 0, 0, 3
-; CHECK-NEXT:xxswapd 36, 0
-; CHECK-NEXT:xxland 35, 35, 36
 ; CHECK-NEXT:vsld 2, 2, 3
 ; CHECK-NEXT:blr
   %rem = and <2 x i64> %b, 
@@ -103,7 +86,6 @@
 ; CHECK-LABEL: test100:
 ; CHECK:   # BB#0:
 ; CHECK-NEXT:rlwinm 3, 3, 0, 24, 31
-; CHECK-NEXT:rlwinm 4, 4, 0, 29, 31
 ; CHECK-NEXT:srw 3, 3, 4
 ; CHECK-NEXT:blr
   %rem = and i8 %b, 7
@@ -115,7 +97,6 @@
 ; CHECK-LABEL: test101:
 ; CHECK:   # BB#0:
 ; CHECK-NEXT:rlwinm 3, 3, 0, 16, 31
-; CHECK-NEXT:rlwinm 4, 4, 0, 28, 31
 ; CHECK-NEXT:srw 3, 3, 4
 ; CHECK-NEXT:blr
   %rem = and i16 %b, 15
@@ -126,7 +107,6 @@
 define i32 @test102(i32 %a, i32 %b) {
 ; CHECK-LABEL: test102:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:rlwinm 4, 4, 0, 27, 31
 ; CHECK-NEXT:srw 3, 3, 4
 ; CHECK-NEXT:blr
   %rem = and i32 %b, 31
@@ -137,7 +117,6 @@
 define i64 @test103(i64 %a, i64 %b) {
 ; CHECK-LABEL: test103:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:rlwinm 4, 4, 0, 26, 31
 ; CHECK-NEXT:srd 3, 3, 4
 ; CHECK-NEXT:blr
   %rem = and i64 %b, 63
@@ -148,8 +127,6 @@
 define <16 x i8> @test110(<16 x i8> %a, <16 x i8> %b) {
 ; CHECK-LABEL: test110:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:vspltisb 4, 7
-; CHECK-NEXT:xxland 35, 35, 36
 ; CHECK-NEXT:vsrb 2, 2, 3
 ; CHECK-NEXT:blr
   %rem = and <16 x i8> %b, 
@@ -160,8 +137,6 @@
 define <8 x i16> @test111(<8 x i16> %a, <8 x i16> %b) {
 ; CHECK-LABEL: test111:
 ; CHECK:   # BB#0:
-; CHECK-NEXT:vspltish 4, 15
-; CHECK-NEXT:xxland 35, 35, 36
 ; CHECK-NEXT:vsrh 2, 2, 3
 ; CHECK-NEXT:blr
   %rem = and <8 x i16> %b, 
@@ -172,10 +147,6 @@
 define <4 x i32> @test112(<4 x i32> %a, <4 x i32> %b) {
 ; CHECK-LABEL: test112:
 ; CHECK:   # 

[clang-tools-extra] r290289 - [clang-tidy] Ignore `size() == 0` in the container implementation.

[Alexander Kornienko via cfe-commits]

Author: alexfh
Date: Wed Dec 21 17:44:23 2016
New Revision: 290289

URL: http://llvm.org/viewvc/llvm-project?rev=290289=rev
Log:
[clang-tidy] Ignore `size() == 0` in the container implementation.

Modified:
clang-tools-extra/trunk/clang-tidy/readability/ContainerSizeEmptyCheck.cpp
clang-tools-extra/trunk/test/clang-tidy/readability-container-size-empty.cpp

Modified: 
clang-tools-extra/trunk/clang-tidy/readability/ContainerSizeEmptyCheck.cpp
URL: 
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/readability/ContainerSizeEmptyCheck.cpp?rev=290289=290288=290289=diff
==
--- clang-tools-extra/trunk/clang-tidy/readability/ContainerSizeEmptyCheck.cpp 
(original)
+++ clang-tools-extra/trunk/clang-tidy/readability/ContainerSizeEmptyCheck.cpp 
Wed Dec 21 17:44:23 2016
@@ -58,7 +58,9 @@ void ContainerSizeEmptyCheck::registerMa
   hasType(pointsTo(ValidContainer)),
   hasType(references(ValidContainer
.bind("STLObject")),
-callee(cxxMethodDecl(hasName("size"))), WrongUse)
+callee(cxxMethodDecl(hasName("size"))), WrongUse,
+unless(hasAncestor(cxxMethodDecl(
+ofClass(equalsBoundNode("container"))
   .bind("SizeCallExpr"),
   this);
 }

Modified: 
clang-tools-extra/trunk/test/clang-tidy/readability-container-size-empty.cpp
URL: 
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/readability-container-size-empty.cpp?rev=290289=290288=290289=diff
==
--- 
clang-tools-extra/trunk/test/clang-tidy/readability-container-size-empty.cpp 
(original)
+++ 
clang-tools-extra/trunk/test/clang-tidy/readability-container-size-empty.cpp 
Wed Dec 21 17:44:23 2016
@@ -61,6 +61,20 @@ public:
 class Derived : public Container {
 };
 
+class Container2 {
+public:
+  int size() const;
+  bool empty() const { return size() == 0; }
+};
+
+class Container3 {
+public:
+  int size() const;
+  bool empty() const;
+};
+
+bool Container3::empty() const { return this->size() == 0; }
+
 int main() {
   std::set intSet;
   std::string str;


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D27680: [CodeGen] Move lifetime.start of a variable when goto jumps back past its declaration

[Akira Hatanaka via Phabricator via cfe-commits]

ahatanak added a comment.

In https://reviews.llvm.org/D27680#628272, @rjmccall wrote:

> Wouldn't it be simpler to just record an insertion point for the beginning of 
> the current lexical scope and insert the lifetime.begin there instead of at 
> the current IP?


I'm not sure I understood your comment, but it seems to me that simply moving 
the lifetime.start intrinsics to the current lexical scope wouldn't work in a 
case like this:

  { // This is the previous lexical scope.
  label1:
...
int a; // We want to move the lifetime.start for "a" to the beginning of 
this scope (not the current lexical scope), since goto is not leaving its scope.
...
{ // This is the current lexical scope.
  int b; // We don't want to move the lifetime.start for "b", since goto is 
leaving its scope.
  goto label1;
}
  }

Currently, the lifetime.start is inserted at the beginning of the basic block 
of the lexical scope holding the goto's destination.

Let me know if I misunderstood your comment or you've found a flaw in this 
approach.


https://reviews.llvm.org/D27680



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D27773: [analyzer] Add checker modeling gtest APIs.

[Devin Coughlin via Phabricator via cfe-commits]

dcoughlin added a comment.

In https://reviews.llvm.org/D27773#629171, @dcoughlin wrote:

> I already committed this, but I'll address the feedback in a follow-on commit.


I should have written "I already committed this, *so* I'll address the feedback 
in a follow-on commit."


https://reviews.llvm.org/D27773



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [clang-tools-extra] r290202 - [clang-tidy] Add modernize-use-default-member-init check

[NAKAMURA Takumi via cfe-commits]

It'd be the issue if the test depended on installed headers. The builder
doesn't have MS headers installed.

On Thu, Dec 22, 2016 at 1:27 AM Aaron Ballman 
wrote:

> On Tue, Dec 20, 2016 at 5:58 PM, Malcolm Parsons
>  wrote:
> > On 20 December 2016 at 22:32, Aaron Ballman 
> wrote:
> >> On Tue, Dec 20, 2016 at 4:26 PM, Malcolm Parsons via cfe-commits
> >>  wrote:
> >>> Author: malcolm.parsons
> >>> Date: Tue Dec 20 15:26:07 2016
> >>> New Revision: 290202
> >>>
> >>> URL: http://llvm.org/viewvc/llvm-project?rev=290202=rev
> >>> Log:
> >>> [clang-tidy] Add modernize-use-default-member-init check
> >>>
> >>> Summary: Fixes PR18858
> >>
> >> This appears to have broken one of the bots:
> >>
> >> http://bb.pgr.jp/builders/ninja-x64-msvc-RA-centos6/builds/33046
> >
> > error: unknown type name 'char16_t'
> > error: unknown type name 'char32_t'
> >
> > I see commented tests in other clang-tidy tests:
> >
> > // TODO: enable these tests once all supported compilers
> > // support char16_t and char32_t (VS2013 does not)
> >
> > // disabled for now until it is clear
> > // how to enable them in the test
> > //} catch (const char16_t*) {
>
> We no longer support MSVC 2013, so that should not be an issue.
> Takumi, I'm not certain what to make of this builder (MSVC centos?).
> What version of Visual Studio is it compiling with? Or is this an
> instance where we need to set the -fms-compatibility-version=19 when
> running the test with clang-cl?
>
> ~Aaron
>
> >
> > --
> > Malcolm Parsons
>
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D27773: [analyzer] Add checker modeling gtest APIs.

[Devin Coughlin via Phabricator via cfe-commits]

dcoughlin added a comment.

I already committed this, but I'll address the feedback in a follow-on commit.




Comment at: lib/StaticAnalyzer/Checkers/GTestChecker.cpp:172
+const CXXConstructorCall *Call, CheckerContext ) const {
+  assert(Call->getNumArgs() > 0);
+

zaks.anna wrote:
> "getNumArgs() == 1" ?
You can have additional arguments to a copy constructor as long as they are 
defaulted. I was trying to be robust against future source-compatible changes, 
but this was probably too clever. If the copy constructor changes then maybe it 
would be better to just not model.



Comment at: lib/StaticAnalyzer/Checkers/GTestChecker.cpp:209
+
+  if (CtorDecl->getNumParams() == 0)
+return;

zaks.anna wrote:
> It seems that the num of parameter checking logic here is less restrictive 
> than it could be and that makes this a bit hard to read without looking into 
> the 'model' methods. Ex: I think there are 2 cases: 
> - Constructor taking a bool can have either 1 or 2 arguments.
> - Copy constructor taking exactly one argument.
> 
> 
I'll make this more clear.



Comment at: test/Driver/analyzer-target-enabled-checkers.cpp:7
 // CHECK-DARWIN: "-analyzer-checker=core"
+// CHECK-DARWIN-SAME: "-analyzer-checker=apiModeling"
 // CHECK-DARWIN-SAME: "-analyzer-checker=unix"

a.sidorin wrote:
> A very minor nit/question.
> Do we have any convention on checker naming? Most checkers are starting with 
> capital letters, but some not. As "API" is an abbreviation, I think we should 
> at least start it with capital.
We're not terribly consistent, but in general we start packages with lowercase 
letters and checkers with uppercase names. Checkers are generally 
UpperCamelCase.

"apiModeling" is a package name, not a checker name. I think to be consistent 
with most of the other packages it should (?) probably be lowerCamelCase. This 
matches "coreFoundation" and "insecureAPI" but not  "deadcode". I had "api" 
lowercase since it is an initialism for a thing (package) that starts with 
lower case and this is how we treat lower camel-case initialisms in Swift. It 
also matches "osx", which is similarly an initialism.

Does knowing it is a package name (rather than a checker name) change your 
opinion of whether "API" should be upper case. I'm happy to change it, since it 
will not be user facing.



https://reviews.llvm.org/D27773



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D27680: [CodeGen] Move lifetime.start of a variable when goto jumps back past its declaration

[Akira Hatanaka via Phabricator via cfe-commits]

ahatanak updated this revision to Diff 82279.
ahatanak marked an inline comment as done.
ahatanak added a comment.

Remove Addr and Size from CallLifetimeEnd.


https://reviews.llvm.org/D27680

Files:
  lib/CodeGen/CGDecl.cpp
  lib/CodeGen/CGExpr.cpp
  lib/CodeGen/CGStmt.cpp
  lib/CodeGen/CodeGenFunction.h
  test/CodeGen/lifetime2.c

Index: test/CodeGen/lifetime2.c
===
--- test/CodeGen/lifetime2.c
+++ test/CodeGen/lifetime2.c
@@ -1,4 +1,4 @@
-// RUN: %clang -S -emit-llvm -o - -O2 %s | FileCheck %s -check-prefixes=CHECK,O2
+// RUN: %clang -S -emit-llvm -o - -O2 -mllvm -disable-llvm-optzns %s | FileCheck %s -check-prefixes=CHECK,O2
 // RUN: %clang -S -emit-llvm -o - -O0 %s | FileCheck %s -check-prefixes=CHECK,O0
 
 extern int bar(char *A, int n);
@@ -19,11 +19,11 @@
 
 // CHECK-LABEL: @no_goto_bypass
 void no_goto_bypass() {
+  // O2: @llvm.lifetime.start(i64 5
   // O2: @llvm.lifetime.start(i64 1
   char x;
 l1:
   bar(, 1);
-  // O2: @llvm.lifetime.start(i64 5
   // O2: @llvm.lifetime.end(i64 5
   char y[5];
   bar(y, 5);
@@ -89,3 +89,58 @@
 L:
   bar(, 1);
 }
+
+// O2-LABEL: define i32 @move_lifetime_start
+// O2: %i = alloca i32, align 4
+// O2: %[[BITCAST:[0-9]+]] = bitcast i32* %i to i8*
+// O2: call void @llvm.lifetime.start(i64 4, i8* %[[BITCAST]])
+// O2: br label %[[DESTLABEL:[a-z0-9]+]]
+// O2: [[DESTLABEL]]:
+// O2: switch i32 %{{.*}}, label %{{.*}} [
+// O2-NEXT: i32 2, label %[[DESTLABEL]]
+
+extern void foo2(int p);
+
+int move_lifetime_start(int a) {
+  int *p = 0;
+label1:
+  if (p) {
+foo2(*p);
+return 0;
+  }
+
+  int i = 999;
+  if (a != 2) {
+p = 
+goto label1;
+  }
+  return -1;
+}
+
+// O2-LABEL: define i32 @dont_move_lifetime_start
+// O2: %i = alloca i32, align 4
+// O2: br label %[[DESTLABEL:[a-z0-9]+]]
+// O2: [[DESTLABEL]]:
+// O2: %[[BITCAST:[0-9]+]] = bitcast i32* %i to i8*
+// O2: call void @llvm.lifetime.start(i64 4, i8* %[[BITCAST]])
+// O2: switch i32 %{{.*}}, label %{{.*}} [
+// O2-NEXT: i32 0, label %{{.*}}
+// O2-NEXT: i32 2, label %[[DESTLABEL]]
+
+int dont_move_lifetime_start(int a) {
+  int *p = 0;
+label1:
+  {
+if (p) {
+  foo2(*p);
+  return 0;
+}
+
+int i = 999;
+if (a != 2) {
+  p = 
+  goto label1;
+}
+  }
+  return -1;
+}
Index: lib/CodeGen/CodeGenFunction.h
===
--- lib/CodeGen/CodeGenFunction.h
+++ lib/CodeGen/CodeGenFunction.h
@@ -346,15 +346,32 @@
   llvm::Instruction *CurrentFuncletPad = nullptr;
 
   class CallLifetimeEnd final : public EHScopeStack::Cleanup {
-llvm::Value *Addr;
-llvm::Value *Size;
+// lifetime.start intrinsic and a flag indicating whether it has been moved
+// to the beginning of the lexical scope of the object associated with the
+// intrinsic.
+llvm::PointerIntPair LifetimeStart;
 
   public:
-CallLifetimeEnd(Address addr, llvm::Value *size)
-: Addr(addr.getPointer()), Size(size) {}
+CallLifetimeEnd(llvm::CallInst *lifetimeStart)
+: LifetimeStart(lifetimeStart) {}
 
 void Emit(CodeGenFunction , Flags flags) override {
-  CGF.EmitLifetimeEnd(Size, Addr);
+  auto *Addr = LifetimeStart.getPointer()->getOperand(1);
+  if (auto *BC = dyn_cast(Addr))
+Addr = BC->getOperand(0);
+  CGF.EmitLifetimeEnd(LifetimeStart.getPointer()->getOperand(0), Addr);
+}
+
+llvm::CallInst *getLifetimeStart() {
+  return LifetimeStart.getPointer();
+}
+
+bool lifetimeStartMoved() const {
+  return LifetimeStart.getInt();
+}
+
+void setLifetimeStartMoved() {
+  LifetimeStart.setInt(true);
 }
   };
 
@@ -523,10 +540,10 @@
   /// \brief Enters a new scope for capturing cleanups, all of which
   /// will be executed once the scope is exited.
   class RunCleanupsScope {
-EHScopeStack::stable_iterator CleanupStackDepth;
 size_t LifetimeExtendedCleanupStackSize;
 bool OldDidCallStackSave;
   protected:
+EHScopeStack::stable_iterator CleanupStackDepth;
 bool PerformCleanup;
   private:
 
@@ -578,6 +595,7 @@
 SourceRange Range;
 SmallVector Labels;
 LexicalScope *ParentScope;
+llvm::BasicBlock *BB;
 
 LexicalScope(const LexicalScope &) = delete;
 void operator=(const LexicalScope &) = delete;
@@ -589,13 +607,27 @@
   CGF.CurLexicalScope = this;
   if (CGDebugInfo *DI = CGF.getDebugInfo())
 DI->EmitLexicalBlockStart(CGF.Builder, Range.getBegin());
+  CGF.EnsureInsertPoint();
+  BB = CGF.Builder.GetInsertBlock();
 }
 
 void addLabel(const LabelDecl *label) {
   assert(PerformCleanup && "adding label to dead scope?");
   Labels.push_back(label);
 }
 
+EHScopeStack::stable_iterator getCleanupStackDepth() const {
+  return CleanupStackDepth;
+}
+
+llvm::BasicBlock *getBasicBlock() const {
+  return BB;
+}
+
+LexicalScope *getParentScope() const {

[PATCH] D28034: [ASTMatchers] Add hasInClassInitializer traversal matcher for FieldDecl.

[Malcolm Parsons via Phabricator via cfe-commits]

malcolm.parsons created this revision.
malcolm.parsons added reviewers: sbenza, bkramer, klimek.
malcolm.parsons added a subscriber: cfe-commits.

I needed to know whether a FieldDecl had an in-class
initializer for https://reviews.llvm.org/D26453. I used a narrowing matcher 
there, but a
traversal matcher might be generally useful.

VarDecl has a hasInitializer traversal matcher.
ForStmt has a withLoopInit traversal matcher.
CXXCtorInitializer has a withInitializer traversal matcher.
EnumConstantDecl doesn't have a traversal matcher for its initializer.
IfStmt doesn't have a traversal matcher for its initializer.


https://reviews.llvm.org/D28034

Files:
  docs/LibASTMatchersReference.html
  include/clang/ASTMatchers/ASTMatchers.h
  lib/ASTMatchers/Dynamic/Registry.cpp
  unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp

Index: unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
===
--- unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
+++ unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
@@ -1404,6 +1404,16 @@
   fieldDecl(isBitField(), hasBitWidth(2), hasName("a";
 }
 
+TEST(Member, InClassInitializer) {
+  EXPECT_TRUE(
+  matches("class C { int a = 2; int b; };",
+  fieldDecl(hasInClassInitializer(integerLiteral(equals(2))),
+hasName("a";
+  EXPECT_TRUE(
+  notMatches("class C { int a = 2; int b; };",
+ fieldDecl(hasInClassInitializer(anything()), hasName("b";
+}
+
 TEST(Member, UnderstandsAccess) {
   EXPECT_TRUE(matches(
 "struct A { int i; };", fieldDecl(isPublic(), hasName("i";
Index: lib/ASTMatchers/Dynamic/Registry.cpp
===
--- lib/ASTMatchers/Dynamic/Registry.cpp
+++ lib/ASTMatchers/Dynamic/Registry.cpp
@@ -232,6 +232,7 @@
   REGISTER_MATCHER(hasFalseExpression);
   REGISTER_MATCHER(hasGlobalStorage);
   REGISTER_MATCHER(hasImplicitDestinationType);
+  REGISTER_MATCHER(hasInClassInitializer);
   REGISTER_MATCHER(hasIncrement);
   REGISTER_MATCHER(hasIndex);
   REGISTER_MATCHER(hasInitializer);
Index: include/clang/ASTMatchers/ASTMatchers.h
===
--- include/clang/ASTMatchers/ASTMatchers.h
+++ include/clang/ASTMatchers/ASTMatchers.h
@@ -533,7 +533,8 @@
   return Node.isBitField();
 }
 
-/// \brief Matches non-static data members that are bit-fields.
+/// \brief Matches non-static data members that are bit-fields of the specified
+/// bit width.
 ///
 /// Given
 /// \code
@@ -543,13 +544,31 @@
 /// int c : 2;
 ///   };
 /// \endcode
-/// fieldDecl(isBitField())
+/// fieldDecl(hasBitWidth(2))
 ///   matches 'int a;' and 'int c;' but not 'int b;'.
 AST_MATCHER_P(FieldDecl, hasBitWidth, unsigned, Width) {
   return Node.isBitField() &&
  Node.getBitWidthValue(Finder->getASTContext()) == Width;
 }
 
+/// \brief Matches non-static data members that have an in-class initializer.
+///
+/// Given
+/// \code
+///   class C {
+/// int a = 2;
+/// int b = 3;
+///   };
+/// \endcode
+/// fieldDecl(hasInClassInitializer(integerLiteral(equals(2
+///   matches 'int a;' but not 'int b;'.
+AST_MATCHER_P(FieldDecl, hasInClassInitializer, internal::Matcher,
+  InnerMatcher) {
+  const Expr *Initializer = Node.getInClassInitializer();
+  return (Initializer != nullptr &&
+  InnerMatcher.matches(*Initializer, Finder, Builder));
+}
+
 /// \brief Matches a declaration that has been implicitly added
 /// by the compiler (eg. implicit default/copy constructors).
 AST_MATCHER(Decl, isImplicit) {
Index: docs/LibASTMatchersReference.html
===
--- docs/LibASTMatchersReference.html
+++ docs/LibASTMatchersReference.html
@@ -2430,15 +2430,16 @@
 
 
 Matcherhttp://clang.llvm.org/doxygen/classclang_1_1FieldDecl.html;>FieldDeclhasBitWidthunsigned Width
-Matches non-static data members that are bit-fields.
+Matches non-static data members that are bit-fields of the specified
+bit width.
 
 Given
   class C {
 int a : 2;
 int b : 4;
 int c : 2;
   };
-fieldDecl(isBitField())
+fieldDecl(hasBitWidth(2))
   matches 'int a;' and 'int c;' but not 'int b;'.
 
 
@@ -4750,6 +4751,19 @@
 
 
 
+Matcherhttp://clang.llvm.org/doxygen/classclang_1_1FieldDecl.html;>FieldDeclhasInClassInitializerMatcherhttp://clang.llvm.org/doxygen/classclang_1_1Expr.html;>Expr InnerMatcher
+Matches non-static data members that have an in-class initializer.
+
+Given
+  class C {
+int a = 2;
+int b = 3;
+  };
+fieldDecl(hasInClassInitializer(integerLiteral(equals(2
+  matches 'int a;' but not 'int b;'.
+
+
+
 Matcherhttp://clang.llvm.org/doxygen/classclang_1_1ForStmt.html;>ForStmthasBodyMatcherhttp://clang.llvm.org/doxygen/classclang_1_1Stmt.html;>Stmt InnerMatcher
 Matches a 'for', 'while', 'do while' statement or a function
 definition that has a 

[PATCH] D28033: [analyzer] Treat pointers to static member functions as function pointers

[Devin Coughlin via Phabricator via cfe-commits]

dcoughlin created this revision.
dcoughlin added a reviewer: kromanenkov.
dcoughlin added subscribers: cfe-commits, NoQ, zaks.anna.

Sema treats pointers to static member functions as having function pointer
type, so treat treat them as function pointer values in the analyzer as well.
This prevents an assertion failure in SValBuilder::evalBinOp caused by code
that expects function pointers to be Locs (in contrast, PointerToMember values
are nonlocs).

Kirill: does this look alright to you?


https://reviews.llvm.org/D28033

Files:
  lib/StaticAnalyzer/Core/SValBuilder.cpp
  test/Analysis/pointer-to-member.cpp


Index: test/Analysis/pointer-to-member.cpp
===
--- test/Analysis/pointer-to-member.cpp
+++ test/Analysis/pointer-to-member.cpp
@@ -78,6 +78,7 @@
   struct A {
 virtual int foo() { return 1; }
 int bar() { return 2;  }
+int static staticMemberFunction(int p) { return p + 1; };
   };
 
   struct B : public A {
@@ -111,11 +112,19 @@
 
 clang_analyzer_eval((APtr->*AFP)() == 3); // expected-warning{{TRUE}}
   }
+
+  void testPointerToStaticMemberCall() {
+int (*fPtr)(int) = ::staticMemberFunction;
+if (fPtr != 0) { // no-crash
+  clang_analyzer_eval(fPtr(2) == 3); // expected-warning{{TRUE}}
+}
+  }
 } // end of testPointerToMemberFunction namespace
 
 namespace testPointerToMemberData {
   struct A {
 int i;
+static int j;
   };
 
   void testPointerToMemberData() {
@@ -126,6 +135,13 @@
 a.*AMdPointer += 1;
 
 clang_analyzer_eval(a.i == 43); // expected-warning{{TRUE}}
+
+int *ptrToStaticField = ::j;
+if (ptrToStaticField != 0) {
+  *ptrToStaticField = 7;
+  clang_analyzer_eval(*ptrToStaticField == 7); // expected-warning{{TRUE}}
+  clang_analyzer_eval(A::j == 7); // expected-warning{{TRUE}}
+}
   }
 } // end of testPointerToMemberData namespace
 
Index: lib/StaticAnalyzer/Core/SValBuilder.cpp
===
--- lib/StaticAnalyzer/Core/SValBuilder.cpp
+++ lib/StaticAnalyzer/Core/SValBuilder.cpp
@@ -218,6 +218,18 @@
 }
 
 DefinedSVal SValBuilder::getMemberPointer(const DeclaratorDecl* DD) {
+  assert(!DD || isa(DD) || isa(DD));
+
+  if (auto *MD = dyn_cast_or_null(DD)) {
+// Sema treats pointers to static member functions as have function pointer
+// type, so return a function pointer for the method.
+// We don't need to play a similar trick for static member fields
+// because these are represented as plain VarDecls and not FieldDecls
+// in the AST.
+if (MD->isStatic())
+  return getFunctionPointer(MD);
+  }
+
   return nonloc::PointerToMember(DD);
 }
 


Index: test/Analysis/pointer-to-member.cpp
===
--- test/Analysis/pointer-to-member.cpp
+++ test/Analysis/pointer-to-member.cpp
@@ -78,6 +78,7 @@
   struct A {
 virtual int foo() { return 1; }
 int bar() { return 2;  }
+int static staticMemberFunction(int p) { return p + 1; };
   };
 
   struct B : public A {
@@ -111,11 +112,19 @@
 
 clang_analyzer_eval((APtr->*AFP)() == 3); // expected-warning{{TRUE}}
   }
+
+  void testPointerToStaticMemberCall() {
+int (*fPtr)(int) = ::staticMemberFunction;
+if (fPtr != 0) { // no-crash
+  clang_analyzer_eval(fPtr(2) == 3); // expected-warning{{TRUE}}
+}
+  }
 } // end of testPointerToMemberFunction namespace
 
 namespace testPointerToMemberData {
   struct A {
 int i;
+static int j;
   };
 
   void testPointerToMemberData() {
@@ -126,6 +135,13 @@
 a.*AMdPointer += 1;
 
 clang_analyzer_eval(a.i == 43); // expected-warning{{TRUE}}
+
+int *ptrToStaticField = ::j;
+if (ptrToStaticField != 0) {
+  *ptrToStaticField = 7;
+  clang_analyzer_eval(*ptrToStaticField == 7); // expected-warning{{TRUE}}
+  clang_analyzer_eval(A::j == 7); // expected-warning{{TRUE}}
+}
   }
 } // end of testPointerToMemberData namespace
 
Index: lib/StaticAnalyzer/Core/SValBuilder.cpp
===
--- lib/StaticAnalyzer/Core/SValBuilder.cpp
+++ lib/StaticAnalyzer/Core/SValBuilder.cpp
@@ -218,6 +218,18 @@
 }
 
 DefinedSVal SValBuilder::getMemberPointer(const DeclaratorDecl* DD) {
+  assert(!DD || isa(DD) || isa(DD));
+
+  if (auto *MD = dyn_cast_or_null(DD)) {
+// Sema treats pointers to static member functions as have function pointer
+// type, so return a function pointer for the method.
+// We don't need to play a similar trick for static member fields
+// because these are represented as plain VarDecls and not FieldDecls
+// in the AST.
+if (MD->isStatic())
+  return getFunctionPointer(MD);
+  }
+
   return nonloc::PointerToMember(DD);
 }
 
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r290276 - Perform type-checking for a converted constant expression in a template

[Richard Smith via cfe-commits]

Author: rsmith
Date: Wed Dec 21 15:42:57 2016
New Revision: 290276

URL: http://llvm.org/viewvc/llvm-project?rev=290276=rev
Log:
Perform type-checking for a converted constant expression in a template
argument even if the expression is value-dependent (we need to suppress the
final portion of the narrowing check, but the rest of the checking can still be
done eagerly).

This affects template template argument validity and partial ordering under
p0522r0.

Modified:
cfe/trunk/include/clang/Sema/Overload.h
cfe/trunk/lib/Sema/SemaInit.cpp
cfe/trunk/lib/Sema/SemaOverload.cpp
cfe/trunk/lib/Sema/SemaTemplate.cpp
cfe/trunk/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp

Modified: cfe/trunk/include/clang/Sema/Overload.h
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Overload.h?rev=290276=290275=290276=diff
==
--- cfe/trunk/include/clang/Sema/Overload.h (original)
+++ cfe/trunk/include/clang/Sema/Overload.h Wed Dec 21 15:42:57 2016
@@ -121,7 +121,11 @@ namespace clang {
 
 /// A narrowing conversion, because a non-constant-expression variable 
might
 /// have got narrowed.
-NK_Variable_Narrowing
+NK_Variable_Narrowing,
+
+/// Cannot tell whether this is a narrowing conversion because the
+/// expression is value-dependent.
+NK_Dependent_Narrowing,
   };
 
   /// StandardConversionSequence - represents a standard conversion

Modified: cfe/trunk/lib/Sema/SemaInit.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaInit.cpp?rev=290276=290275=290276=diff
==
--- cfe/trunk/lib/Sema/SemaInit.cpp (original)
+++ cfe/trunk/lib/Sema/SemaInit.cpp Wed Dec 21 15:42:57 2016
@@ -6816,7 +6816,7 @@ InitializationSequence::Perform(Sema ,
   CurInit = CurInitExprRes;
 
   if (Step->Kind == SK_ConversionSequenceNoNarrowing &&
-  S.getLangOpts().CPlusPlus && !CurInit.get()->isValueDependent())
+  S.getLangOpts().CPlusPlus)
 DiagnoseNarrowingInInitList(S, *Step->ICS, SourceType, 
Entity.getType(),
 CurInit.get());
 
@@ -8070,6 +8070,7 @@ static void DiagnoseNarrowingInInitList(
   switch (SCS->getNarrowingKind(S.Context, PostInit, ConstantValue,
 ConstantType)) {
   case NK_Not_Narrowing:
+  case NK_Dependent_Narrowing:
 // No narrowing occurred.
 return;
 

Modified: cfe/trunk/lib/Sema/SemaOverload.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=290276=290275=290276=diff
==
--- cfe/trunk/lib/Sema/SemaOverload.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOverload.cpp Wed Dec 21 15:42:57 2016
@@ -329,6 +329,11 @@ StandardConversionSequence::getNarrowing
 } else if (FromType->isIntegralType(Ctx) && ToType->isRealFloatingType()) {
   llvm::APSInt IntConstantValue;
   const Expr *Initializer = IgnoreNarrowingConversion(Converted);
+
+  // If it's value-dependent, we can't tell whether it's narrowing.
+  if (Initializer->isValueDependent())
+return NK_Dependent_Narrowing;
+
   if (Initializer &&
   Initializer->isIntegerConstantExpr(IntConstantValue, Ctx)) {
 // Convert the integer to the floating type.
@@ -362,6 +367,11 @@ StandardConversionSequence::getNarrowing
 Ctx.getFloatingTypeOrder(FromType, ToType) == 1) {
   // FromType is larger than ToType.
   const Expr *Initializer = IgnoreNarrowingConversion(Converted);
+
+  // If it's value-dependent, we can't tell whether it's narrowing.
+  if (Initializer->isValueDependent())
+return NK_Dependent_Narrowing;
+
   if (Initializer->isCXX11ConstantExpr(Ctx, )) {
 // Constant!
 assert(ConstantValue.isFloat());
@@ -403,6 +413,11 @@ StandardConversionSequence::getNarrowing
   // Not all values of FromType can be represented in ToType.
   llvm::APSInt InitializerValue;
   const Expr *Initializer = IgnoreNarrowingConversion(Converted);
+
+  // If it's value-dependent, we can't tell whether it's narrowing.
+  if (Initializer->isValueDependent())
+return NK_Dependent_Narrowing;
+
   if (!Initializer->isIntegerConstantExpr(InitializerValue, Ctx)) {
 // Such conversions on variables are always narrowing.
 return NK_Variable_Narrowing;
@@ -5289,6 +5304,9 @@ static ExprResult CheckConvertedConstant
   QualType PreNarrowingType;
   switch (SCS->getNarrowingKind(S.Context, Result.get(), PreNarrowingValue,
 PreNarrowingType)) {
+  case NK_Dependent_Narrowing:
+// Implicit conversion to a narrower type, but the expression is
+// value-dependent so we can't tell whether it's actually narrowing.
   case NK_Variable_Narrowing:
 // Implicit conversion to a narrower type, and 

Re: [PATCH] D27123: Add AVR target and toolchain to Clang

[Nico Weber via cfe-commits]

On Wed, Dec 21, 2016 at 6:42 AM, Senthil Kumar Selvaraj via Phabricator via
cfe-commits  wrote:

> saaadhu added a comment.
>
> Would someone with a llvm bugzilla account please file the PR for me? New
> user registration is disabled, and I've been waiting for
> llvm-ad...@lists.llvm.org to respond for nearly a week now.
>

Email to...@nondot.org directly, see
http://lists.llvm.org/pipermail/cfe-dev/2016-December/051921.html


>
> And how should I proceed after that? Would one of the reviewers commit the
> patch for me?
>
>
> https://reviews.llvm.org/D27123
>
>
>
> ___
> cfe-commits mailing list
> cfe-commits@lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D27123: Add AVR target and toolchain to Clang

[Dylan McKay via cfe-commits]

I'm happy to file a bug if you give me a description

> Would one of the reviewers commit the patch for me?

I'm happy to commit it, so long as somebody else signs off on it.

On Thu, Dec 22, 2016 at 12:42 AM, Senthil Kumar Selvaraj via Phabricator <
revi...@reviews.llvm.org> wrote:

> saaadhu added a comment.
>
> Would someone with a llvm bugzilla account please file the PR for me? New
> user registration is disabled, and I've been waiting for
> llvm-ad...@lists.llvm.org to respond for nearly a week now.
>
> And how should I proceed after that? Would one of the reviewers commit the
> patch for me?
>
>
> https://reviews.llvm.org/D27123
>
>
>
>
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r290268 - ARM: define a macro for the FPv5 FPU in ARM mode.

[Tim Northover via cfe-commits]

Author: tnorthover
Date: Wed Dec 21 14:49:43 2016
New Revision: 290268

URL: http://llvm.org/viewvc/llvm-project?rev=290268=rev
Log:
ARM: define a macro for the FPv5 FPU in ARM mode.

FPv5 is in Cortex-M7 and the 64-bit CPUs when running in 32-bit mode. The name
is from the Cortex-M7 TRM.

Modified:
cfe/trunk/lib/Basic/Targets.cpp
cfe/trunk/test/Preprocessor/arm-target-features.c

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=290268=290267=290268=diff
==
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Wed Dec 21 14:49:43 2016
@@ -5391,6 +5391,8 @@ public:
 Builder.defineMacro("__ARM_VFPV3__");
   if (FPU & VFP4FPU)
 Builder.defineMacro("__ARM_VFPV4__");
+  if (FPU & FPARMV8)
+Builder.defineMacro("__ARM_FPV5__");
 }
 
 // This only gets set when Neon instructions are actually available, unlike

Modified: cfe/trunk/test/Preprocessor/arm-target-features.c
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/arm-target-features.c?rev=290268=290267=290268=diff
==
--- cfe/trunk/test/Preprocessor/arm-target-features.c (original)
+++ cfe/trunk/test/Preprocessor/arm-target-features.c Wed Dec 21 14:49:43 2016
@@ -389,6 +389,7 @@
 // M7-THUMB:#define __ARM_ARCH_EXT_IDIV__ 1
 // M7-THUMB:#define __ARM_FEATURE_DSP 1
 // M7-THUMB:#define __ARM_FP 0xE
+// M7-THUMB:#define __ARM_FPV5__ 1
 
 // Test whether predefines are as expected when targeting krait.
 // RUN: %clang -target armv7 -mcpu=krait -x c -E -dM %s -o - | FileCheck 
-match-full-lines --check-prefix=KRAIT %s


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D27898: [compiler-rt] [builtins] Implement __floattitf() & __floatuntitf()

[Weiming Zhao via Phabricator via cfe-commits]

weimingz added a comment.

The patch looks good to me.


https://reviews.llvm.org/D27898



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D27898: [compiler-rt] [builtins] Implement __floattitf() & __floatuntitf()

[Weiming Zhao via Phabricator via cfe-commits]

weimingz added a comment.

Thanks for the formatting. Regarding the refactoring, Regarding factoring out 
common code, I think it's OK to do it in a follow-up patch. For readability, it 
should be OK. For example, fp_add_impl.inc is used by float, double and long 
double.


https://reviews.llvm.org/D27898



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r290262 - Make some diagnostic tests C++11 clean.

[Paul Robinson via cfe-commits]

Author: probinson
Date: Wed Dec 21 12:33:17 2016
New Revision: 290262

URL: http://llvm.org/viewvc/llvm-project?rev=290262=rev
Log:
Make some diagnostic tests C++11 clean.

Differential Revision: http://reviews.llvm.org/D27794

Modified:
cfe/trunk/test/FixIt/fixit.cpp
cfe/trunk/test/Parser/backtrack-off-by-one.cpp
cfe/trunk/test/SemaCXX/copy-assignment.cpp

Modified: cfe/trunk/test/FixIt/fixit.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit.cpp?rev=290262=290261=290262=diff
==
--- cfe/trunk/test/FixIt/fixit.cpp (original)
+++ cfe/trunk/test/FixIt/fixit.cpp Wed Dec 21 12:33:17 2016
@@ -1,8 +1,12 @@
-// RUN: %clang_cc1 -pedantic -Wall -Wno-comment -verify -fcxx-exceptions -x 
c++ %s
+// RUN: %clang_cc1 -pedantic -Wall -Wno-comment -verify -fcxx-exceptions -x 
c++ -std=c++98 %s
+// RUN: cp %s %t-98
+// RUN: not %clang_cc1 -pedantic -Wall -Wno-comment -fcxx-exceptions -fixit -x 
c++ -std=c++98 %t-98
+// RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror -Wno-comment 
-fcxx-exceptions -x c++ -std=c++98 %t-98
 // RUN: not %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits -x c++ 
-std=c++11 %s 2>&1 | FileCheck %s
-// RUN: cp %s %t
-// RUN: not %clang_cc1 -pedantic -Wall -Wno-comment -fcxx-exceptions -fixit -x 
c++ %t
-// RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror -Wno-comment 
-fcxx-exceptions -x c++ %t
+// RUN: %clang_cc1 -pedantic -Wall -Wno-comment -verify -fcxx-exceptions -x 
c++ -std=c++11 %s
+// RUN: cp %s %t-11
+// RUN: not %clang_cc1 -pedantic -Wall -Wno-comment -fcxx-exceptions -fixit -x 
c++ -std=c++11 %t-11
+// RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror -Wno-comment 
-fcxx-exceptions -x c++ -std=c++11 %t-11
 
 /* This is a test of the various code modification hints that are
provided as part of warning or extension diagnostics. All of the
@@ -21,7 +25,11 @@ static void C1::g() { } // expected-erro
 
 template struct CT { template struct Inner; }; // 
expected-note{{previous use is here}}
 
+// FIXME: In C++11 this gets 'expected unqualified-id' which fixit can't fix.
+// Probably parses as `CT<10> > 2 > ct;` rather than `CT<(10 >> 2)> ct;`.
+#if __cplusplus < 201103L
 CT<10 >> 2> ct; // expected-warning{{require parentheses}}
+#endif
 
 class C3 {
 public:
@@ -41,7 +49,11 @@ protected:
 };
 
 class B : public A {
+#if __cplusplus >= 201103L
+  A::foo; // expected-error{{ISO C++11 does not allow access declarations}}
+#else
   A::foo; // expected-warning{{access declarations are deprecated}}
+#endif
 };
 
 void f() throw(); // expected-note{{previous}}
@@ -285,8 +297,10 @@ namespace greatergreater {
 void (*p)() = ;
 (void)(==p); // expected-error {{use '> ='}}
 (void)(>=p); // expected-error {{use '> >'}}
+#if __cplusplus < 201103L
 (void)(>=p); // expected-error {{use '> >'}}
 (Shr)>>=p; // expected-error {{use '> >'}}
+#endif
 
 // FIXME: We correct this to ' > >= p;' not ' >>= p;'
 //(Shr)>>=p;

Modified: cfe/trunk/test/Parser/backtrack-off-by-one.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/backtrack-off-by-one.cpp?rev=290262=290261=290262=diff
==
--- cfe/trunk/test/Parser/backtrack-off-by-one.cpp (original)
+++ cfe/trunk/test/Parser/backtrack-off-by-one.cpp Wed Dec 21 12:33:17 2016
@@ -1,4 +1,6 @@
 // RUN: %clang_cc1 -verify %s
+// RUN: %clang_cc1 -verify %s -std=c++98
+// RUN: %clang_cc1 -verify %s -std=c++11
 
 // PR25946
 // We had an off-by-one error in an assertion when annotating A below.  
Our
@@ -10,8 +12,10 @@ template  class A {};
 
 // expected-error@+1 {{expected '{' after base class list}}
 template  class B : T // not ',' or '{'
-// expected-error@+3 {{C++ requires a type specifier for all declarations}}
-// expected-error@+2 {{expected ';' after top level declarator}}
+#if __cplusplus < 201103L
+// expected-error@+4 {{expected ';' after top level declarator}}
+#endif
+// expected-error@+2 {{C++ requires a type specifier for all declarations}}
 // expected-error@+1 {{expected ';' after class}}
 A {
 };

Modified: cfe/trunk/test/SemaCXX/copy-assignment.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/copy-assignment.cpp?rev=290262=290261=290262=diff
==
--- cfe/trunk/test/SemaCXX/copy-assignment.cpp (original)
+++ cfe/trunk/test/SemaCXX/copy-assignment.cpp Wed Dec 21 12:33:17 2016
@@ -1,4 +1,11 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++98
+// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++11
+
+#if __cplusplus >= 201103L
+// expected-note@+3 2 {{candidate constructor}}
+// expected-note@+2 {{passing argument to parameter here}}
+#endif
 struct A {
 };
 
@@ -7,6 +14,9 @@ struct ConvertibleToA {
 };
 
 struct