Skip to content

Commit a3f8548

Browse files
committed
Merge pull request #327 from erg/linux-warnings
Fix eight warnings on Linux.
2 parents 45d2bad + 86d99ce commit a3f8548

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

lib/IDE/SyntaxModel.cpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,10 +1291,7 @@ bool ModelASTWalker::processComment(CharSourceRange Range) {
12911291
bool ModelASTWalker::findUrlStartingLoc(StringRef Text,
12921292
unsigned &Start,
12931293
std::regex &Regex) {
1294-
#ifndef SWIFT_HAVE_WORKING_STD_REGEX
1295-
return false;
1296-
#endif
1297-
1294+
#ifdef SWIFT_HAVE_WORKING_STD_REGEX
12981295
static const auto MailToPosition = std::find(URLProtocols.begin(),
12991296
URLProtocols.end(),
13001297
"mailto");
@@ -1318,6 +1315,7 @@ bool ModelASTWalker::findUrlStartingLoc(StringRef Text,
13181315
return true;
13191316
}
13201317
}
1318+
#endif
13211319
return false;
13221320
}
13231321

@@ -1354,10 +1352,8 @@ bool ModelASTWalker::searchForURL(CharSourceRange Range) {
13541352
Optional<SyntaxNode> ModelASTWalker::parseFieldNode(StringRef Text,
13551353
StringRef OrigText,
13561354
SourceLoc OrigLoc) {
1357-
#ifndef SWIFT_HAVE_WORKING_STD_REGEX
1358-
return None;
1359-
#endif
1360-
1355+
Optional<SyntaxNode> Node;
1356+
#ifdef SWIFT_HAVE_WORKING_STD_REGEX
13611357
std::match_results<StringRef::iterator> Matches;
13621358
for (unsigned i = 0; i != 3; ++i) {
13631359
auto &Rx = getDocCommentRegex(i);
@@ -1372,7 +1368,9 @@ Optional<SyntaxNode> ModelASTWalker::parseFieldNode(StringRef Text,
13721368
StringRef MatchStr(Match.first, Match.second - Match.first);
13731369
auto Loc = OrigLoc.getAdvancedLoc(MatchStr.data() - OrigText.data());
13741370
CharSourceRange Range(Loc, MatchStr.size());
1375-
return Optional<SyntaxNode>({ SyntaxNodeKind::DocCommentField, Range });
1371+
Node = Optional<SyntaxNode>({ SyntaxNodeKind::DocCommentField, Range });
1372+
#endif
1373+
return Node;
13761374
}
13771375

13781376
bool ModelASTWalker::findFieldsInDocCommentLine(SyntaxNode Node) {

lib/Immediate/REPL.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ class ConvertForWcharSize<4> {
130130

131131
using Convert = ConvertForWcharSize<sizeof(wchar_t)>;
132132

133+
#if defined(__APPLE__)
133134
static void convertFromUTF8(llvm::StringRef utf8,
134135
llvm::SmallVectorImpl<wchar_t> &out) {
135136
size_t reserve = out.size() + utf8.size();
@@ -157,9 +158,12 @@ static void convertToUTF8(llvm::ArrayRef<wchar_t> wide,
157158
(void)res;
158159
out.set_size(utf8_begin - out.begin());
159160
}
161+
#endif
160162

161163
} // end anonymous namespace
162164

165+
#if defined(__APPLE__)
166+
163167
static bool appendToREPLFile(SourceFile &SF,
164168
PersistentParserState &PersistentState,
165169
REPLContext &RC,
@@ -183,8 +187,6 @@ static bool appendToREPLFile(SourceFile &SF,
183187
return FoundAnySideEffects;
184188
}
185189

186-
#if defined(__APPLE__)
187-
188190
/// An arbitrary, otherwise-unused char value that editline interprets as
189191
/// entering/leaving "literal mode", meaning it passes prompt characters through
190192
/// to the terminal without affecting the line state. This prevents color

lib/SILAnalysis/AliasAnalysis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ static bool isTypedAccessOracle(SILInstruction *I) {
368368
/// address is with pointer_to_address (via UnsafePointer) or
369369
/// unchecked_addr_cast (via Builtin.reinterpretCast). Consequently, if the
370370
/// given value is directly derived from a memory location, it cannot
371-
/// alias. Call arguments also cannot alias because they must follow @in, @out,
372-
/// @inout, or @in_guaranteed conventions.
371+
/// alias. Call arguments also cannot alias because they must follow \@in, @out,
372+
/// @inout, or \@in_guaranteed conventions.
373373
///
374374
/// FIXME: pointer_to_address should contain a flag that indicates whether the
375375
/// address is aliasing. Currently, we aggressively assume that

stdlib/public/runtime/Casting.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,6 +1388,7 @@ swift::swift_dynamicCastMetatypeUnconditional(const Metadata *sourceType,
13881388
}
13891389
}
13901390

1391+
#if SWIFT_OBJC_INTEROP
13911392
/// Do a dynamic cast to the target class.
13921393
static void *_dynamicCastUnknownClass(void *object,
13931394
const Metadata *targetType,
@@ -1400,6 +1401,7 @@ static void *_dynamicCastUnknownClass(void *object,
14001401

14011402
return const_cast<void*>(swift_dynamicCastUnknownClass(object, targetType));
14021403
}
1404+
#endif
14031405

14041406
static bool _dynamicCastUnknownClassIndirect(OpaqueValue *dest,
14051407
void *object,

0 commit comments

Comments
 (0)