From 32df0e741befb3cc815927c37cb29dd039e62158 Mon Sep 17 00:00:00 2001 From: Andy Ayers Date: Mon, 25 Mar 2019 15:05:45 -0700 Subject: [PATCH] JIT: don't treat whitespace as separator in assembly name lists (#23410) Only recognize ";" as a separator, so that we can support exclusions or inclusions of assemblies whose names include spaces. Impacts the altjit exclude list, and the disasm include list. Addresses dotnet/jitutils#200. --- src/jit/utils.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/jit/utils.cpp b/src/jit/utils.cpp index 888fe60..029ba03 100644 --- a/src/jit/utils.cpp +++ b/src/jit/utils.cpp @@ -1469,7 +1469,8 @@ void HelperCallProperties::init() // The string should be of the form // MyAssembly // MyAssembly;mscorlib;System -// MyAssembly;mscorlib System +// +// You must use ';' as a separator; whitespace no longer works AssemblyNamesList2::AssemblyNamesList2(const wchar_t* list, HostAllocator alloc) : m_alloc(alloc) { @@ -1481,12 +1482,9 @@ AssemblyNamesList2::AssemblyNamesList2(const wchar_t* list, HostAllocator alloc) { WCHAR curChar = *listWalk; - if (iswspace(curChar) || curChar == W(';') || curChar == W('\0')) + if (curChar == W(';') || curChar == W('\0')) { - // - // Found white-space - // - + // Found separator or end of string if (nameStart) { // Found the end of the current name; add a new assembly name to the list. -- 2.7.4