Merge branch 'wip' of oss.readytalk.com:/var/local/git/avian into wip

readme.txt

@@ -376,7 +376,7 @@ EOF
 
 Step 5: Run ProGuard with stage1 as input and stage2 as output.
 
- $ java -jar ../../proguard4.3/lib/proguard.jar \
+ $ java -jar ../../proguard4.4/lib/proguard.jar \
      -injars stage1 -outjars stage2 @../vm.pro @hello.pro
 
 (note: pass -dontusemixedcaseclassnames to ProGuard when building on

src/compiler.cpp

@@ -1008,7 +1008,7 @@ deadWord(Context* c, Value* v)
   Value* nextWord = v->nextWord;
   assert(c, nextWord != v);
 
-  for (SiteIterator it(c, v); it.hasMore();) {
+  for (SiteIterator it(c, v, true, false); it.hasMore();) {
     Site* s = it.next();
     
     if (s->registerSize(c) > BytesPerWord) {

src/jnienv.cpp

@@ -41,6 +41,19 @@ AttachCurrentThread(Machine* m, Thread** t, void*)
   return 0;
 }
 
+jint JNICALL
+AttachCurrentThreadAsDaemon(Machine* m, Thread** t, void* parameters)
+{
+  *t = static_cast<Thread*>(m->localThread->get());
+  if (*t == 0) {
+    AttachCurrentThread(m, t, parameters);
+
+    ENTER(*t, Thread::ActiveState);
+    setDaemon(*t, (*t)->javaThread, true);
+  }
+  return 0;
+}
+
 jint JNICALL
 DetachCurrentThread(Machine* m)
 {
@@ -1902,6 +1915,7 @@ populateJNITables(JavaVMVTable* vmTable, JNIEnvVTable* envTable)
 
   vmTable->DestroyJavaVM = DestroyJavaVM;
   vmTable->AttachCurrentThread = AttachCurrentThread;
+  vmTable->AttachCurrentThreadAsDaemon = AttachCurrentThreadAsDaemon;
   vmTable->DetachCurrentThread = DetachCurrentThread;
   vmTable->GetEnv = GetEnv;