Skip to content

MSFT:18210422 Remove the dummy field in NoResizeLock that adds 8 bytes to all BaseDictionary instances using NoResizeLock. #5539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2018
Merged

MSFT:18210422 Remove the dummy field in NoResizeLock that adds 8 bytes to all BaseDictionary instances using NoResizeLock. #5539

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
25 changes: 10 additions & 15 deletions lib/Common/DataStructures/BaseDictionary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
#include "DictionaryStats.h"
#endif

#pragma warning(push)
#pragma warning(disable:__WARNING_FAILING_TO_ACQUIRE_MEDIUM_CONFIDENCE)
#pragma warning(disable:__WARNING_CALLER_FAILING_TO_HOLD_MEDIUM_CONFIDENCE)

namespace Js
{
template <class TDictionary>
Expand All @@ -44,20 +48,11 @@ namespace JsDiag

namespace JsUtil
{
struct contentStruct
{
Field(int) cs;
};
class NoResizeLock
{
public:
#pragma prefast(suppress:__WARNING_FAILING_TO_ACQUIRE_MEDIUM_CONFIDENCE)
void _Acquires_lock_(cs.cs) BeginResize() {}
#pragma prefast(suppress:__WARNING_FAILING_TO_RELEASE_MEDIUM_CONFIDENCE)
void _Releases_lock_(cs.cs) EndResize() {}
private:
// For prefast analysis, we need to have a somewhat similar shape for both locks
Field(contentStruct) cs;
void BeginResize() {}
void EndResize() {}
};

class AsymetricResizeLock
Expand Down Expand Up @@ -126,10 +121,8 @@ namespace JsUtil
class AutoDoResize
{
public:
#pragma prefast(suppress:__WARNING_FAILING_TO_ACQUIRE_MEDIUM_CONFIDENCE)
_Acquires_lock_(this->lock.cs.cs) AutoDoResize(Lock& lock) : lock(lock) { this->lock.BeginResize(); };
#pragma prefast(suppress:__WARNING_CALLER_FAILING_TO_HOLD_MEDIUM_CONFIDENCE)
_Releases_lock_(this->lock.cs.cs) ~AutoDoResize() { this->lock.EndResize(); };
AutoDoResize(Lock& lock) : lock(lock) { this->lock.BeginResize(); };
~AutoDoResize() { this->lock.EndResize(); };
private:
Lock& lock;
};
Expand Down Expand Up @@ -1863,3 +1856,5 @@ namespace JsUtil
PREVENT_COPY(SynchronizedDictionary);
};
}

#pragma warning(pop)