change IsStringLiteralInit into a static function in SemaInit.cpp
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65395 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index e3235ac..fe2ff75 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -27,7 +27,8 @@
// Sema Initialization Checking
//===----------------------------------------------------------------------===//
-StringLiteral *Sema::IsStringLiteralInit(Expr *Init, QualType DeclType) {
+static StringLiteral *IsStringInit(Expr *Init, QualType DeclType,
+ ASTContext &Context) {
if (const ArrayType *AT = Context.getAsArrayType(DeclType))
if (AT->getElementType()->isCharType())
return dyn_cast<StringLiteral>(Init->IgnoreParens());
@@ -105,7 +106,7 @@
InitListExpr *InitList = dyn_cast<InitListExpr>(Init);
if (!InitList) {
// FIXME: Handle wide strings
- if (StringLiteral *StrLiteral = IsStringLiteralInit(Init, DeclType))
+ if (StringLiteral *StrLiteral = IsStringInit(Init, DeclType, Context))
return CheckStringLiteralInit(StrLiteral, DeclType);
// C++ [dcl.init]p14:
@@ -475,7 +476,7 @@
if (Index < IList->getNumInits()) {
// We have leftover initializers
if (IList->getNumInits() > 0 &&
- SemaRef->IsStringLiteralInit(IList->getInit(Index), T)) {
+ IsStringInit(IList->getInit(Index), T, SemaRef->Context)) {
unsigned DK = diag::warn_excess_initializers_in_char_array_initializer;
if (SemaRef->getLangOptions().CPlusPlus)
DK = diag::err_excess_initializers_in_char_array_initializer;
@@ -579,8 +580,8 @@
newStructuredList, newStructuredIndex);
++StructuredIndex;
++Index;
- } else if (StringLiteral *lit =
- SemaRef->IsStringLiteralInit(expr, ElemType)) {
+ } else if (StringLiteral *lit = IsStringInit(expr, ElemType,
+ SemaRef->Context)) {
SemaRef->CheckStringLiteralInit(lit, ElemType);
UpdateStructuredListElement(StructuredList, StructuredIndex, lit);
++Index;
@@ -765,8 +766,8 @@
unsigned &StructuredIndex) {
// Check for the special-case of initializing an array with a string.
if (Index < IList->getNumInits()) {
- if (StringLiteral *lit =
- SemaRef->IsStringLiteralInit(IList->getInit(Index), DeclType)) {
+ if (StringLiteral *lit = IsStringInit(IList->getInit(Index), DeclType,
+ SemaRef->Context)) {
SemaRef->CheckStringLiteralInit(lit, DeclType);
// We place the string literal directly into the resulting
// initializer list. This is the only place where the structure