Merge pull request #21280 from dsouzai/fixgetSumBranchCount_0.51

0.51: Fix bug in TR_IPBCDataFourBytes::getSumBranchCount

Author: mpirvu

runtime/compiler/runtime/IProfiler.cpp

@@ -2683,11 +2683,11 @@ TR_IPBCDataFourBytes::copyFromEntry(TR_IPBytecodeHashTableEntry* originalEntry,
    data = entry->data;
    }
 
-int16_t
+int32_t
 TR_IPBCDataFourBytes::getSumBranchCount()
    {
-   uint16_t fallThroughCount = (uint16_t)(data & 0x0000FFFF) | 0x1;
-   uint16_t branchToCount = (uint16_t)((data & 0xFFFF0000)>>16) | 0x1;
+   int32_t fallThroughCount = (int32_t)(data & 0x0000FFFF) | 0x1;
+   int32_t branchToCount = (int32_t)((data & 0xFFFF0000)>>16) | 0x1;
    return (fallThroughCount + branchToCount);
    }
 

runtime/compiler/runtime/IProfiler.hpp

@@ -322,7 +322,7 @@ class TR_IPBCDataFourBytes : public TR_IPBytecodeHashTableEntry
 #endif
    virtual void createPersistentCopy(TR_J9SharedCache *sharedCache, TR_IPBCDataStorageHeader *storage, TR::PersistentInfo *info);
    virtual void loadFromPersistentCopy(TR_IPBCDataStorageHeader *storage, TR::Compilation *comp);
-   int16_t getSumBranchCount();
+   int32_t getSumBranchCount();
    virtual void copyFromEntry(TR_IPBytecodeHashTableEntry * originalEntry, TR::Compilation *comp);
 private:
    uint32_t data;