<div style="font-family: arial, helvetica, sans-serif; font-size: 10pt">Thanks!<br><br><div class="gmail_quote">On Fri, Dec 21, 2012 at 9:17 AM, Richard Relph <span dir="ltr"><<a href="mailto:Richard.Relph@amd.com" target="_blank">Richard.Relph@amd.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rrelph<br>
Date: Thu Dec 20 23:17:13 2012<br>
New Revision: 170843<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=170843&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=170843&view=rev</a><br>
Log:<br>
Clean up some warnings that become errors. Seen in Xcode.<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/asan/tests/<a href="http://asan_mac_test.mm" target="_blank">asan_mac_test.mm</a><br>
    compiler-rt/trunk/lib/asan/tests/asan_test.cc<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/<a href="http://asan_mac_test.mm" target="_blank">asan_mac_test.mm</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_mac_test.mm?rev=170843&r1=170842&r2=170843&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_mac_test.mm?rev=170843&r1=170842&r2=170843&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/<a href="http://asan_mac_test.mm" target="_blank">asan_mac_test.mm</a> (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/<a href="http://asan_mac_test.mm" target="_blank">asan_mac_test.mm</a> Thu Dec 20 23:17:13 2012<br>
@@ -57,7 +57,7 @@<br>
 @implementation LoadSomething<br>
<br>
 +(void) load {<br>
-  for (int i = 0; i < strlen(kStartupStr); i++) {<br>
+  for (size_t i = 0; i < strlen(kStartupStr); i++) {<br>
     access_memory(&kStartupStr[i]);  // make sure no optimizations occur.<br>
   }<br>
   // Don't print anything here not to interfere with the death tests.<br>
@@ -66,13 +66,13 @@<br>
 @end<br>
<br>
 void worker_do_alloc(int size) {<br>
-  char * volatile mem = malloc(size);<br>
+  char * volatile mem = (char * volatile)malloc(size);<br>
   mem[0] = 0; // Ok<br>
   free(mem);<br>
 }<br>
<br>
 void worker_do_crash(int size) {<br>
-  char * volatile mem = malloc(size);<br>
+  char * volatile mem = (char * volatile)malloc(size);<br>
   access_memory(&mem[size]);  // BOOM<br>
   free(mem);<br>
 }<br>
@@ -167,7 +167,7 @@<br>
       dispatch_time(DISPATCH_TIME_NOW, 1LL * NSEC_PER_SEC);<br>
<br>
   dispatch_source_set_timer(timer, milestone, DISPATCH_TIME_FOREVER, 0);<br>
-  char * volatile mem = malloc(10);<br>
+  char * volatile mem = (char * volatile)malloc(10);<br>
   dispatch_source_set_event_handler(timer, ^{<br>
     access_memory(&mem[10]);<br>
   });<br>
@@ -184,7 +184,7 @@<br>
       dispatch_time(DISPATCH_TIME_NOW, 1LL * NSEC_PER_SEC);<br>
<br>
   dispatch_source_set_timer(timer, milestone, DISPATCH_TIME_FOREVER, 0);<br>
-  char * volatile mem = malloc(10);<br>
+  char * volatile mem = (char * volatile)malloc(10);<br>
   // Both dispatch_source_set_cancel_handler() and<br>
   // dispatch_source_set_event_handler() use dispatch_barrier_async_f().<br>
   // It's tricky to test dispatch_source_set_cancel_handler() separately,<br>
@@ -202,7 +202,7 @@<br>
 void TestGCDGroupAsync() {<br>
   dispatch_queue_t queue = dispatch_get_global_queue(0, 0);<br>
   dispatch_group_t group = dispatch_group_create();<br>
-  char * volatile mem = malloc(10);<br>
+  char * volatile mem = (char * volatile)malloc(10);<br>
   dispatch_group_async(group, queue, ^{<br>
     access_memory(&mem[10]);<br>
   });<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/asan_test.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=170843&r1=170842&r2=170843&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=170843&r1=170842&r2=170843&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/asan_test.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/asan_test.cc Thu Dec 20 23:17:13 2012<br>
@@ -2293,7 +2293,7 @@<br>
 TEST(AddressSanitizerMac, Mstats) {<br>
   malloc_statistics_t stats1, stats2;<br>
   malloc_zone_statistics(/*all zones*/NULL, &stats1);<br>
-  const int kMallocSize = 100000;<br>
+  const size_t kMallocSize = 100000;<br>
   void *alloc = Ident(malloc(kMallocSize));<br>
   malloc_zone_statistics(/*all zones*/NULL, &stats2);<br>
   EXPECT_GT(stats2.blocks_in_use, stats1.blocks_in_use);<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Alexey Samsonov, MSK</div><br>
</div>