Silence more -Wnon-pod-memset given its current implementation. I may be

able to revert these based on a patch I'm working on, but no reason for
people to be spammed with warnings in the interim.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@130394 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/TemplateBase.cpp b/lib/AST/TemplateBase.cpp
index b57f10b0c64392078d808ca7abbec17fc8d1b09f..6114a5a051bec9af11b63bc4264af0022caca852 100644 (file)
--- a/lib/AST/TemplateBase.cpp
+++ b/lib/AST/TemplateBase.cpp
@@ -338,7 +338,7 @@ void TemplateArgument::print(const PrintingPolicy &Policy,
 //===----------------------------------------------------------------------===//
 
 TemplateArgumentLocInfo::TemplateArgumentLocInfo() {
-  memset(this, 0, sizeof(TemplateArgumentLocInfo));
+  memset((void*)this, 0, sizeof(TemplateArgumentLocInfo));
 }
 
 SourceRange TemplateArgumentLoc::getSourceRange() const {

diff --git a/lib/Analysis/UninitializedValues.cpp b/lib/Analysis/UninitializedValues.cpp
index a1a49b6757f811387f4c6f5aa082b52e735a5943..88a2db751a43e4a51e64325300c82c5ddea0c0c8 100644 (file)
--- a/lib/Analysis/UninitializedValues.cpp
+++ b/lib/Analysis/UninitializedValues.cpp
@@ -173,7 +173,7 @@ CFGBlockValues::CFGBlockValues(const CFG &c) : cfg(c), vals(0) {
   if (!n)
     return;
   vals = new std::pair<ValueVector*, ValueVector*>[n];
-  memset(vals, 0, sizeof(*vals) * n);
+  memset((void*)vals, 0, sizeof(*vals) * n);
 }
 
 CFGBlockValues::~CFGBlockValues() {

diff --git a/lib/Lex/MacroArgs.cpp b/lib/Lex/MacroArgs.cpp
index 89f6368a277f5601281193c957ba1701e25e7708..dee7da38aaa007a513b1490e03b7cc1a49ad48ad 100644 (file)
--- a/lib/Lex/MacroArgs.cpp
+++ b/lib/Lex/MacroArgs.cpp
@@ -284,7 +284,7 @@ const Token &MacroArgs::getStringifiedArgument(unsigned ArgNo,
   assert(ArgNo < NumUnexpArgTokens && "Invalid argument number!");
   if (StringifiedArgs.empty()) {
     StringifiedArgs.resize(getNumArguments());
-    memset(&StringifiedArgs[0], 0,
+    memset((void*)&StringifiedArgs[0], 0,
            sizeof(StringifiedArgs[0])*getNumArguments());
   }
   if (StringifiedArgs[ArgNo].isNot(tok::string_literal))