Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Fix error during compilation with /permissive- #18272

Merged
jkotas merged 1 commit into from
Jun 4, 2018
Merged

Fix error during compilation with /permissive- #18272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/classlibnative/bcltype/grisu3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Grisu3
static void CachedPower(int k, DiyFp* cmk, int* decimalExponent);
static bool DigitGen(const DiyFp& mp, int count, wchar_t* buffer, int* len, int* k);
static bool RoundWeed(wchar_t* buffer, int len, UINT64 rest, UINT64 tenKappa, UINT64 ulp, int* kappa);
static void Grisu3::BiggestPowerTenLessThanOrEqualTo(UINT32 number, int bits, UINT32 *power, int *exponent);
static void BiggestPowerTenLessThanOrEqualTo(UINT32 number, int bits, UINT32 *power, int *exponent);

// 1/lg(10)
static const double D_1_LOG2_10;
Expand Down Expand Up @@ -158,4 +158,4 @@ class Grisu3
};
};

#endif
#endif
2 changes: 1 addition & 1 deletion src/inc/winrt/paraminstanceapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ namespace Ro { namespace detail {
__in_ecount(size) const T* src,
size_t size)
{
for (size_t i = 0; i != _size; ++i)
for (size_t i = 0; i != size; ++i)
Copy link
Copy Markdown

@mikedn mikedn Jun 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to check if this function is actually used. Since it used to compile there's a good change that it is not and it compiled only due to the way older versions of VC++ handle templates.

Copy link
Copy Markdown
Author

@kant2002 kant2002 Jun 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikedn indeed it is not used, at least after removing it code still compiling. Is it safe to be removed? In the docs seems that code is compiled using VS 2015 too, but I only check using VS 2017 toolchain.

Copy link
Copy Markdown
Member

@jkotas jkotas Jun 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is ok to keep it for symmetry, even though it is unused right now.

Copy link
Copy Markdown

@mikedn mikedn Jun 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, it's not 100% unused as it may seem. This is template code so it's possible, at least in theory, that at some point someone will attempt to instantiate with a type parameter different from char/wchar_t

{
dst[i] = src[i];
}
Expand Down
2 changes: 1 addition & 1 deletion src/jit/lsra.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1587,7 +1587,7 @@ class LinearScan : public LinearScanInterface
void setDelayFree(RefPosition* use);
int BuildBinaryUses(GenTreeOp* node, regMaskTP candidates = RBM_NONE);
#ifdef _TARGET_XARCH_
int LinearScan::BuildRMWUses(GenTreeOp* node, regMaskTP candidates = RBM_NONE);
int BuildRMWUses(GenTreeOp* node, regMaskTP candidates = RBM_NONE);
#endif // !_TARGET_XARCH_
// This is the main entry point for building the RefPositions for a node.
// These methods return the number of sources.
Expand Down
3 changes: 2 additions & 1 deletion src/vm/dllimport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6110,8 +6110,9 @@ static void DetermineLibNameVariations(const WCHAR** libNameVariations, int* num
// LoadLibrary won't append extension if filename itself contains '.'. Thus it will break the following scenario:
// [DllImport("A.B")] // The full name for file is "A.B.dll". This is common code pattern for cross-platform PInvoke
// The workaround for above scenario is to call LoadLibrary with "A.B" first, if it fails, then call LoadLibrary with "A.B.dll"
auto it = libName.Begin();
if (!libNameIsRelativePath ||
!libName.Find(libName.Begin(), W('.')) ||
!libName.Find(it, W('.')) ||
libName.EndsWith(W(".")) ||
libName.EndsWithCaseInsensitive(W(".dll")) ||
libName.EndsWithCaseInsensitive(W(".exe")))
Expand Down