[vmkit-commits] [vmkit] r180437 - able to compile without optimization and with assert

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:09:39 2013
New Revision: 180437

URL: http://llvm.org/viewvc/llvm-project?rev=180437&view=rev
Log:
able to compile without optimization and with assert
(cherry picked from commit 236eecf4315972ddc29c99591094bb8333951ce4)

Modified:
    vmkit/trunk/Makefile.rules
    vmkit/trunk/lib/j3/VMCore/JavaArray.h

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=180437&r1=180436&r2=180437&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Apr 25 12:09:39 2013
@@ -36,8 +36,8 @@ ifeq ($(OPTIMIZED),1)
   LLC_FLAGS+= -O=3 -disable-cfi -disable-fp-elim 
   COMMON_CFLAGS+= -O3 -fno-strict-aliasing -fno-omit-frame-pointer 
 else
-  LLC_FLAGS+= -O=0 
-  COMMON_CFLAGS+= -O0
+  LLC_FLAGS+= -O=0 -disable-cfi -disable-fp-elim 
+  COMMON_CFLAGS+= -O0 -fno-strict-aliasing -fno-omit-frame-pointer 
 endif
 
 LLC_FLAGS+=-relocation-model=pic 

Modified: vmkit/trunk/lib/j3/VMCore/JavaArray.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaArray.h?rev=180437&r1=180436&r2=180437&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaArray.h Thu Apr 25 12:09:39 2013
@@ -46,29 +46,29 @@ public:
   T elements[1];
 
 public:
-  static int32_t getSize(const TJavaArray* self) {
+  static int32_t getSize(const TJavaArray* self) __attribute__((always_inline)) {
     llvm_gcroot(self, 0);
     return self->size;
   }
   
-  static T getElement(const TJavaArray* self, uint32_t i) {
+  static T getElement(const TJavaArray* self, uint32_t i) __attribute__((always_inline)) {
     llvm_gcroot(self, 0);
     assert((ssize_t)i < self->size);
     return self->elements[i];
   }
 
-  static void setElement(TJavaArray* self, T value, uint32_t i) {
+  static void setElement(TJavaArray* self, T value, uint32_t i) __attribute__((always_inline)) {
     llvm_gcroot(self, 0);
     assert((ssize_t)i < self->size);
     self->elements[i] = value;
   }
 
-  static const T* getElements(const TJavaArray* self) {
+  static const T* getElements(const TJavaArray* self) __attribute__((always_inline)) {
     llvm_gcroot(self, 0);
     return self->elements;
   }
 
-  static T* getElements(TJavaArray* self) {
+  static T* getElements(TJavaArray* self) __attribute__((always_inline)) {
     llvm_gcroot(self, 0);
     return self->elements;
   }
@@ -92,7 +92,7 @@ public:
     return self->size;
   }
   
-  static JavaObject* getElement(const ArrayObject* self, uint32_t i) {
+  static JavaObject* getElement(const ArrayObject* self, uint32_t i) __attribute__((always_inline)) {
     llvm_gcroot(self, 0);
     assert((ssize_t)i < self->size);
     return self->elements[i];
@@ -100,7 +100,7 @@ public:
 
   static void setElement(ArrayObject* self, JavaObject* value, uint32_t i);
 
-  static JavaObject** getElements(ArrayObject* self) {
+  static JavaObject** getElements(ArrayObject* self) __attribute__((always_inline)) {
     llvm_gcroot(self, 0);
     return self->elements;
   }
@@ -142,7 +142,7 @@ public:
   static const unsigned int T_INT;
   static const unsigned int T_LONG;
 
-  static void setSize(JavaObject* array, int size) {
+  static void setSize(JavaObject* array, int size) __attribute__((always_inline)) {
     ArrayUInt8* obj = 0;
     llvm_gcroot(obj, 0);
     llvm_gcroot(array, 0);
@@ -150,7 +150,7 @@ public:
     obj->size = size;
   }
 
-  static sint32 getSize(const JavaObject* array) {
+  static sint32 getSize(const JavaObject* array) __attribute__((always_inline)) {
     const ArrayUInt8* obj = 0;
     llvm_gcroot(obj, 0);
     llvm_gcroot(array, 0);
@@ -158,7 +158,7 @@ public:
     return obj->size;
   }
 
-  static const unsigned char* getElements(const JavaObject* array) {
+  static const unsigned char* getElements(const JavaObject* array) __attribute__((always_inline)) {
     const ArrayUInt8* obj = 0;
     llvm_gcroot(obj, 0);
     llvm_gcroot(array, 0);
@@ -166,7 +166,7 @@ public:
     return obj->elements;
   }
 
-  static unsigned char* getElements(JavaObject* array) {
+  static unsigned char* getElements(JavaObject* array) __attribute__((always_inline)) {
     ArrayUInt8* obj = 0;
     llvm_gcroot(obj, 0);
     llvm_gcroot(array, 0);