diff options
| -rw-r--r-- | src/ToolBox/SOS/Strike/strike.cpp | 2 | ||||
| -rw-r--r-- | src/ToolBox/SOS/Strike/util.cpp | 5 | ||||
| -rw-r--r-- | src/gc/gc.cpp | 12 | ||||
| -rw-r--r-- | src/vm/decodemd.cpp | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/src/ToolBox/SOS/Strike/strike.cpp b/src/ToolBox/SOS/Strike/strike.cpp index 8f56cccaf5..fe8e4014e6 100644 --- a/src/ToolBox/SOS/Strike/strike.cpp +++ b/src/ToolBox/SOS/Strike/strike.cpp @@ -3895,7 +3895,7 @@ private: bool operator<(const StringSetEntry &rhs) const { - return _wcscmp(str, rhs.str) == -1; + return _wcscmp(str, rhs.str) < 0; } }; diff --git a/src/ToolBox/SOS/Strike/util.cpp b/src/ToolBox/SOS/Strike/util.cpp index 4186dcb415..9e7de5412b 100644 --- a/src/ToolBox/SOS/Strike/util.cpp +++ b/src/ToolBox/SOS/Strike/util.cpp @@ -753,9 +753,8 @@ HRESULT CheckEEDll() // Do we have clr.dll if (moduleInfo[MSCORWKS].baseAddr == 0) { - if (moduleInfo[MSCORWKS].baseAddr == 0) - g_ExtSymbols->GetModuleByModuleName (MAIN_CLR_MODULE_NAME_A,0,NULL, - &moduleInfo[MSCORWKS].baseAddr); + g_ExtSymbols->GetModuleByModuleName (MAIN_CLR_MODULE_NAME_A,0,NULL, + &moduleInfo[MSCORWKS].baseAddr); if (moduleInfo[MSCORWKS].baseAddr != 0 && moduleInfo[MSCORWKS].hasPdb == FALSE) { g_ExtSymbols->GetModuleParameters (1, &moduleInfo[MSCORWKS].baseAddr, 0, &Params); diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp index 6e74047d34..0c42d721c1 100644 --- a/src/gc/gc.cpp +++ b/src/gc/gc.cpp @@ -22544,7 +22544,7 @@ void gc_heap::make_free_lists (int condemned_gen_number) void gc_heap::make_free_list_in_brick (BYTE* tree, make_free_args* args) { - assert ((tree >= 0)); + assert ((tree != NULL)); { int right_node = node_right_child (tree); int left_node = node_left_child (tree); @@ -23282,7 +23282,7 @@ void gc_heap::relocate_survivors_in_plug (BYTE* plug, BYTE* plug_end, void gc_heap::relocate_survivors_in_brick (BYTE* tree, relocate_args* args) { - assert ((tree != 0)); + assert ((tree != NULL)); dprintf (3, ("tree: %Ix, args->last_plug: %Ix, left: %Ix, right: %Ix, gap(t): %Ix", tree, args->last_plug, @@ -23463,7 +23463,7 @@ void gc_heap::walk_plug (BYTE* plug, size_t size, BOOL check_last_object_p, walk void gc_heap::walk_relocation_in_brick (BYTE* tree, walk_relocate_args* args, size_t profiling_context) { - assert ((tree != 0)); + assert ((tree != NULL)); if (node_left_child (tree)) { walk_relocation_in_brick (tree + node_left_child (tree), args, profiling_context); @@ -24041,7 +24041,7 @@ void gc_heap::compact_plug (BYTE* plug, size_t size, BOOL check_last_object_p, c void gc_heap::compact_in_brick (BYTE* tree, compact_args* args) { - assert (tree >= 0); + assert (tree != NULL); int left_node = node_left_child (tree); int right_node = node_right_child (tree); ptrdiff_t relocation = node_relocation_distance (tree); @@ -27497,7 +27497,7 @@ void gc_heap::count_plug (size_t last_plug_size, BYTE*& last_plug) void gc_heap::count_plugs_in_brick (BYTE* tree, BYTE*& last_plug) { - assert ((tree != 0)); + assert ((tree != NULL)); if (node_left_child (tree)) { count_plugs_in_brick (tree + node_left_child (tree), last_plug); @@ -28518,7 +28518,7 @@ void gc_heap::realloc_in_brick (BYTE* tree, BYTE*& last_plug, unsigned int& active_new_gen_number, BYTE*& last_pinned_gap, BOOL& leftp) { - assert (tree >= 0); + assert (tree != NULL); int left_node = node_left_child (tree); int right_node = node_right_child (tree); diff --git a/src/vm/decodemd.cpp b/src/vm/decodemd.cpp index 91dab49087..588ec44c10 100644 --- a/src/vm/decodemd.cpp +++ b/src/vm/decodemd.cpp @@ -73,7 +73,7 @@ const BYTE decoded_10[2] = {10, END_DECODED }; #define DOING_BITS (MAX_HEADER+1) #define DECODING_BITS(partial, got, header) (DOING_BITS+(partial<<8)+(got<<16)+(header<<24)) #define DECODING_ERROR ((unsigned) -1) -#define MASK(len) (~((~0)<<len)) +#define MASK(len) (~(~0u <<len)) #define MASK64(len) ((~((~((unsigned __int64)0))<<len))) #define BITS_PER_BYTE (sizeof(BYTE)*8) |