<br><br><div class="gmail_quote">On Mon, Nov 7, 2011 at 8:34 PM, Will Dietz <span dir="ltr"><<a href="mailto:wdietz2@illinois.edu">wdietz2@illinois.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
On Mon, Nov 7, 2011 at 5:16 AM, Gael Thomas <<a href="mailto:gael.thomas@lip6.fr">gael.thomas@lip6.fr</a>> wrote:<br>
> Author: gthomas<br>
> Date: Mon Nov  7 05:16:04 2011<br>
> New Revision: 143957<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=143957&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=143957&view=rev</a><br>
> Log:<br>
> avoid warnings, LLVM_HOSTTRIPLE is now LLVM_DEFAULT_TARGET_TRIPLE<br>
><br>
> Modified:<br>
>    vmkit/trunk/   (props changed)<br>
>    vmkit/trunk/lib/J3/ClassLib/   (props changed)<br>
>    vmkit/trunk/lib/J3/ClassLib/GNUClasspath/   (props changed)<br>
>    vmkit/trunk/lib/J3/VMCore/JavaClass.cpp<br>
>    vmkit/trunk/lib/J3/VMCore/JavaObject.cpp<br>
>    vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp<br>
>    vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp<br>
>    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp<br>
>    vmkit/trunk/lib/Mvm/MMTk/   (props changed)<br>
>    vmkit/trunk/mmtk/inline/   (props changed)<br>
>    vmkit/trunk/mmtk/java/   (props changed)<br>
>    vmkit/trunk/mmtk/mmtk-alloc/   (props changed)<br>
>    vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp<br>
>    vmkit/trunk/tools/   (props changed)<br>
><br>
> Propchange: vmkit/trunk/<br>
> ------------------------------------------------------------------------------<br>
> --- svn:ignore (original)<br>
> +++ svn:ignore Mon Nov  7 05:16:04 2011<br>
> @@ -1,5 +1,6 @@<br>
>  do-find<br>
>  Makefile.config<br>
> +Makefile.llvmbuild<br>
>  replace.sh<br>
>  config.log<br>
>  *.tmp<br>
><br>
> Propchange: vmkit/trunk/lib/J3/ClassLib/<br>
> ------------------------------------------------------------------------------<br>
> --- svn:ignore (added)<br>
> +++ svn:ignore Mon Nov  7 05:16:04 2011<br>
> @@ -0,0 +1 @@<br>
> +Classpath.h<br>
><br>
> Propchange: vmkit/trunk/lib/J3/ClassLib/GNUClasspath/<br>
> ------------------------------------------------------------------------------<br>
> --- svn:ignore (added)<br>
> +++ svn:ignore Mon Nov  7 05:16:04 2011<br>
> @@ -0,0 +1 @@<br>
> +Release<br>
><br>
> Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=143957&r1=143956&r2=143957&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=143957&r1=143956&r2=143957&view=diff</a><br>

> ==============================================================================<br>
> --- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)<br>
> +++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Mon Nov  7 05:16:04 2011<br>
> @@ -877,7 +877,8 @@<br>
>   PRINT_DEBUG(JNJVM_LOAD, 0, COLOR_NORMAL, "%s\n", mvm::PrintBuffer(this).cString());<br>
><br>
>   Reader reader(bytes);<br>
> -  uint32 magic = reader.readU4();<br>
> +  uint32 magic;<br>
> +  magic = reader.readU4();<br>
>   assert(magic == Jnjvm::Magic && "I've created a class but magic is no good!");<br>
><br>
>   /* uint16 minor = */ reader.readU2();<br>
><br>
> Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.cpp?rev=143957&r1=143956&r2=143957&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.cpp?rev=143957&r1=143956&r2=143957&view=diff</a><br>

> ==============================================================================<br>
> --- vmkit/trunk/lib/J3/VMCore/JavaObject.cpp (original)<br>
> +++ vmkit/trunk/lib/J3/VMCore/JavaObject.cpp Mon Nov  7 05:16:04 2011<br>
> @@ -34,7 +34,8 @@<br>
>   assert(mvm::HashBits != 0);<br>
><br>
>   word_t header = self->header;<br>
> -  word_t GCBits = header & mvm::GCBitMask;<br>
> +  word_t GCBits;<br>
> +  GCBits = header & mvm::GCBitMask;<br>
>   word_t val = header & HashMask;<br>
>   if (val != 0) {<br>
>     return val ^ (word_t)getClass(self);<br>
><br>
> Modified: vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp?rev=143957&r1=143956&r2=143957&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp?rev=143957&r1=143956&r2=143957&view=diff</a><br>

> ==============================================================================<br>
> --- vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp (original)<br>
> +++ vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp Mon Nov  7 05:16:04 2011<br>
> @@ -45,10 +45,12 @@<br>
>  void ThinLock::removeFatLock(FatLock* fatLock, LockSystem& table) {<br>
>   gc* object = fatLock->associatedObject;<br>
>   llvm_gcroot(object, 0);<br>
> -  word_t ID = fatLock->getID();<br>
> +  word_t ID;<br>
>   word_t oldValue = 0;<br>
>   word_t newValue = 0;<br>
>   word_t yieldedValue = 0;<br>
> +<br>
> +  ID = fatLock->getID();<br>
>   do {<br>
>     oldValue = object->header;<br>
>     newValue = oldValue & NonLockBitsMask;<br>
><br>
> Modified: vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp?rev=143957&r1=143956&r2=143957&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp?rev=143957&r1=143956&r2=143957&view=diff</a><br>

> ==============================================================================<br>
> --- vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp (original)<br>
> +++ vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp Mon Nov  7 05:16:04 2011<br>
> @@ -130,7 +130,8 @@<br>
>  }<br>
><br>
>  Cond::Cond() {<br>
> -  int errorcode = pthread_cond_init((pthread_cond_t*)&internalCond, NULL);<br>
> +  int errorcode;<br>
> +  errorcode = pthread_cond_init((pthread_cond_t*)&internalCond, NULL);<br>
>   assert(errorcode == 0);<br>
>  }<br>
><br>
> @@ -145,11 +146,11 @@<br>
>  void Cond::wait(Lock* l) {<br>
>   assert(l->selfOwner());<br>
>   int n = l->unsafeUnlock();<br>
> -<br>
> +  int res;<br>
>   Thread* th = Thread::get();<br>
>   th->enterUncooperativeCode();<br>
> -  int res = pthread_cond_wait((pthread_cond_t*)&internalCond,<br>
> -                              (pthread_mutex_t*)&(l->internalLock));<br>
> +  res = pthread_cond_wait((pthread_cond_t*)&internalCond,<br>
> +                                                                                                       (pthread_mutex_t*)&(l->internalLock));<br>
>   th->leaveUncooperativeCode();<br>
><br>
>   assert(!res && "Error on wait");<br>
><br>
> Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=143957&r1=143956&r2=143957&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=143957&r1=143956&r2=143957&view=diff</a><br>

> ==============================================================================<br>
> --- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)<br>
> +++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Mon Nov  7 05:16:04 2011<br>
> @@ -60,7 +60,11 @@<br>
>  }<br>
><br>
>  const char* MvmModule::getHostTriple() {<br>
> -  return LLVM_HOSTTRIPLE;<br>
> +#ifdef LLVM_HOSTTRIPLE<br>
> +  return LLVM_HOSTTRIPLE<br>
<br>
But I needed that semicolon! :)<br></blockquote><div><br></div><div>Yeah, thanks for putting it back Will :)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">

<br>
Just wondering, what compiler are you using that's causing the<br>
warnings fixed in this commit?<br></blockquote><div><br></div><div>This is due to a change in llvm that removes LLVM_HOSTTRIPLE. See:</div><div><a href="http://llvm.org/viewvc/llvm-project?view=rev&revision=143501">http://llvm.org/viewvc/llvm-project?view=rev&revision=143501</a></div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<br>
> +#else<br>
> +  return LLVM_DEFAULT_TARGET_TRIPLE;<br>
> +#endif<br>
>  }<br>
><br>
>  cl::opt<bool><br>
> @@ -416,7 +420,8 @@<br>
>     FrameIterator iterator(*frames);<br>
>     while (iterator.hasNext()) {<br>
>       FrameInfo* frame = iterator.next();<br>
> -      FrameInfo* other = VM->IPToFrameInfo(frame->ReturnAddress);<br>
> +      FrameInfo* other;<br>
> +      other = VM->IPToFrameInfo(frame->ReturnAddress);<br>
>       assert(frame->ReturnAddress == other->ReturnAddress);<br>
>     }<br>
>   }<br>
><br>
> Propchange: vmkit/trunk/lib/Mvm/MMTk/<br>
> ------------------------------------------------------------------------------<br>
> --- svn:ignore (original)<br>
> +++ svn:ignore Mon Nov  7 05:16:04 2011<br>
> @@ -1 +1,3 @@<br>
>  Release+Asserts<br>
> +Release<br>
> +<br>
><br>
> Propchange: vmkit/trunk/mmtk/inline/<br>
> ------------------------------------------------------------------------------<br>
> --- svn:ignore (original)<br>
> +++ svn:ignore Mon Nov  7 05:16:04 2011<br>
> @@ -1,2 +1,3 @@<br>
>  Release+Asserts<br>
> +Release<br>
>  *.inc<br>
><br>
> Propchange: vmkit/trunk/mmtk/java/<br>
> ------------------------------------------------------------------------------<br>
> --- svn:ignore (original)<br>
> +++ svn:ignore Mon Nov  7 05:16:04 2011<br>
> @@ -1,5 +1,6 @@<br>
>  build.xml<br>
>  Release+Asserts<br>
> +Release<br>
>  mmtk-vmkit.bc<br>
>  mmtk-vmkit-optimized.bc<br>
>  mmtk-vmkit.jar<br>
><br>
> Propchange: vmkit/trunk/mmtk/mmtk-alloc/<br>
> ------------------------------------------------------------------------------<br>
> --- svn:ignore (original)<br>
> +++ svn:ignore Mon Nov  7 05:16:04 2011<br>
> @@ -1 +1,3 @@<br>
>  Release+Asserts<br>
> +Release<br>
> +<br>
><br>
> Modified: vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp?rev=143957&r1=143956&r2=143957&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp?rev=143957&r1=143956&r2=143957&view=diff</a><br>

> ==============================================================================<br>
> --- vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp (original)<br>
> +++ vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp Mon Nov  7 05:16:04 2011<br>
> @@ -22,7 +22,8 @@<br>
>   int64_t result;<br>
>   struct timeval tp;<br>
><br>
> -  int res = gettimeofday (&tp, NULL);<br>
> +  int res;<br>
> +       res = gettimeofday (&tp, NULL);<br>
>   assert(res != -1 && "failed gettimeofday.");<br>
><br>
>   result = (int64_t) tp.tv_sec;<br>
><br>
> Propchange: vmkit/trunk/tools/<br>
> ------------------------------------------------------------------------------<br>
> --- svn:ignore (added)<br>
> +++ svn:ignore Mon Nov  7 05:16:04 2011<br>
> @@ -0,0 +1 @@<br>
> +llvm-config-2<br>
><br>
><br>
> _______________________________________________<br>
> vmkit-commits mailing list<br>
> <a href="mailto:vmkit-commits@cs.uiuc.edu">vmkit-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits</a><br>
><br>
<br>
_______________________________________________<br>
vmkit-commits mailing list<br>
<a href="mailto:vmkit-commits@cs.uiuc.edu">vmkit-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits</a><br>
</blockquote></div><br>