[compiler-rt] r268704 - [profile] Remove another unneeded field in raw profile reader

[Xinliang David Li via llvm-commits]

Author: davidxl
Date: Thu May  5 21:13:12 2016
New Revision: 268704

URL: http://llvm.org/viewvc/llvm-project?rev=268704&view=rev
Log:
[profile] Remove another unneeded field in raw profile reader

DataValueSize is now removed. The change is consolidated
with previous raw version bump.


Modified:
    compiler-rt/trunk/lib/profile/InstrProfData.inc
    compiler-rt/trunk/lib/profile/InstrProfilingMerge.c

Modified: compiler-rt/trunk/lib/profile/InstrProfData.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfData.inc?rev=268704&r1=268703&r2=268704&view=diff
==============================================================================
--- compiler-rt/trunk/lib/profile/InstrProfData.inc (original)
+++ compiler-rt/trunk/lib/profile/InstrProfData.inc Thu May  5 21:13:12 2016
@@ -103,7 +103,6 @@ INSTR_PROF_RAW_HEADER(uint64_t, NamesSiz
 INSTR_PROF_RAW_HEADER(uint64_t, CountersDelta, (uintptr_t)CountersBegin)
 INSTR_PROF_RAW_HEADER(uint64_t, NamesDelta, (uintptr_t)NamesBegin)
 INSTR_PROF_RAW_HEADER(uint64_t, ValueKindLast, IPVK_Last)
-INSTR_PROF_RAW_HEADER(uint64_t, ValueDataSize, ValueDataSize)
 #undef INSTR_PROF_RAW_HEADER
 /* INSTR_PROF_RAW_HEADER  end */
 

Modified: compiler-rt/trunk/lib/profile/InstrProfilingMerge.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingMerge.c?rev=268704&r1=268703&r2=268704&view=diff
==============================================================================
--- compiler-rt/trunk/lib/profile/InstrProfilingMerge.c (original)
+++ compiler-rt/trunk/lib/profile/InstrProfilingMerge.c Thu May  5 21:13:12 2016
@@ -46,8 +46,7 @@ int __llvm_profile_check_compatibility(c
 
   if (ProfileSize < sizeof(__llvm_profile_header) +
                         Header->DataSize * sizeof(__llvm_profile_data) +
-                        Header->NamesSize + Header->CountersSize +
-                        Header->ValueDataSize)
+                        Header->NamesSize + Header->CountersSize)
     return 1;
 
   for (SrcData = SrcDataStart,