Index: compiler-rt/trunk/lib/xray/xray_fdr_logging.cc
===================================================================
--- compiler-rt/trunk/lib/xray/xray_fdr_logging.cc
+++ compiler-rt/trunk/lib/xray/xray_fdr_logging.cc
@@ -459,7 +459,7 @@
   FuncRecord.Type = RecordType::Function;
 
   // Only get the lower 28 bits of the function id.
-  FuncRecord.FuncId = FuncId | ~(0x03 << 28);
+  FuncRecord.FuncId = FuncId & ~(0x0F << 28);
 
   // Here we compute the TSC Delta. There are a few interesting situations we
   // need to account for: