averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address code-review feedback for #33430

Browse Source
This commit is contained in:
Artem Chikin
2020-08-12 17:39:06 -07:00
parent 2a8e4b2d49
commit 721f903567
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/swift/Frontend/ModuleInterfaceLoader.h
View File

@@ -112,7 +112,6 @@
#include "swift/Frontend/ModuleInterfaceSupport.h"
#include "swift/Serialization/SerializedModuleLoader.h"
#include "llvm/Support/StringSaver.h"
#include <sstream>
namespace clang {
class CompilerInstance;
@@ -263,8 +262,14 @@ private:
} else if (key == "sourceInfoPath") {
result.moduleSourceInfoPath = val.str();
} else if (key == "isFramework") {
std::istringstream is(val.str());
is >> std::boolalpha >> result.isFramework;
auto valStr = val.str();
valStr.erase(std::remove(valStr.begin(), valStr.end(), '\n'), valStr.end());
if (valStr.compare("true") == 0)
result.isFramework = true;
else if (valStr.compare("false") == 0)
result.isFramework = false;
else
llvm_unreachable("Unexpected JSON value for isFramework");
} else {
// Being forgiving for future fields.
continue;