{objc.exp,objc-torture.exp}: New files for objc testing harness.

* lib/{objc.exp,objc-torture.exp}: New files for objc testing harness.
        * objc: ObjC testsuite.

From-SVN: r22198

gcc/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+Thu Sep  3 00:40:32 1998  Ovidiu Predescu  <ovidiu@aracnet.com>
+
+	* lib/{objc.exp,objc-torture.exp}: New files for objc testing harness.
+	* objc: ObjC testsuite.
+
 Mon Aug 31 15:19:32 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* lib/c-torture.exp: Add support for

gcc/testsuite/lib/objc-torture.exp

@@ -0,0 +1,316 @@
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-dejagnu.prep.ai.mit.edu
+
+# This file was written by Rob Savoye. (rob@cygnus.com)
+
+# The default option list can be overridden by
+# TORTURE_OPTIONS="{ { list1 } ... { listN } }"
+
+if ![info exists TORTURE_OPTIONS] {
+    # FIXME: We should test -g at least once.
+    set TORTURE_OPTIONS [list { -O }]
+}
+
+
+# Split TORTURE_OPTIONS into two choices: one for testcases with loops and
+# one for testcases without loops.
+
+set torture_with_loops $TORTURE_OPTIONS
+set torture_without_loops ""
+foreach option $TORTURE_OPTIONS {
+    if ![string match "*loop*" $option] {
+	lappend torture_without_loops $option
+    }
+}
+
+#
+# objc-torture-compile -- runs the Tege C-torture test
+#
+# SRC is the full pathname of the testcase.
+# OPTION is the specific compiler flag we're testing (eg: -O2).
+#
+proc objc-torture-compile { src option } {
+    global output
+    global srcdir tmpdir
+    global host_triplet
+
+    set output "$tmpdir/[file tail [file rootname $src]].o"
+
+    regsub "^$srcdir/?" $src "" testcase
+    # If we couldn't rip $srcdir out of `src' then just do the best we can.
+    # The point is to reduce the unnecessary noise in the logs.  Don't strip
+    # out too much because different testcases with the same name can confuse
+    # `test-tool'.
+    if [string match "/*" $testcase] {
+	set testcase "[file tail [file dirname $src]]/[file tail $src]"
+    }
+
+    verbose "Testing $testcase, $option" 1
+
+    # Run the compiler and analyze the results.
+    set options ""
+    lappend options "additional_flags=-w $option"
+
+    set comp_output [objc_target_compile "$src" "$output" object $options];
+    
+    # Set a few common compiler messages.
+    set fatal_signal "*77*: Internal compiler error: program*got fatal signal"
+ 
+    if [string match "$fatal_signal 6" $comp_output] then {
+	objc_fail $testcase "Got Signal 6, $option"
+	remote_file build delete $output
+	return
+    }
+
+    if [string match "$fatal_signal 11" $comp_output] then {
+	objc_fail $testcase "Got Signal 11, $option"
+	remote_file build delete $output
+	return
+    }
+
+    # We shouldn't get these because of -w, but just in case.
+    if [string match "*77*:*warning:*" $comp_output] then {
+	warning "$testcase: (with warnings) $option"
+	send_log "$comp_output\n"
+	unresolved "$testcase, $option"
+	remote_file build delete $output
+	return
+    }
+
+    set comp_output [prune_warnings $comp_output]
+
+    set unsupported_message [objc_check_unsupported_p $comp_output]
+    if { $unsupported_message != "" } {
+	unsupported "$testcase: $unsupported_message"
+	remote_file build delete $output
+	return
+    }
+
+    # remove any leftover LF/CR to make sure any output is legit
+    regsub -all -- "\[\r\n\]*" $comp_output "" comp_output
+    # If any message remains, we fail.
+    if ![string match "" $comp_output] then {
+	objc_fail $testcase $option
+	remote_file build delete $output
+	return
+    }
+
+    objc_pass $testcase $option
+    remote_file build delete $output
+}
+
+#
+# objc-torture-execute -- utility to compile and execute a testcase
+#
+# SRC is the full pathname of the testcase.
+#
+# If the testcase has an associated .cexp file, we source that to run the
+# test instead.  We use .cexp instead of .exp so that the testcase is still
+# controlled by the main .exp driver (this is useful when one wants to only
+# run the compile.exp tests for example - one need only pass compile.exp to
+# dejagnu, and not compile.exp, foo1.exp, foo2.exp, etc.).
+#
+proc objc-torture-execute { src } {
+    global tmpdir tool srcdir output 
+
+    # Check for alternate driver.
+    if [file exists [file rootname $src].cexp] {
+	verbose "Using alternate driver [file rootname [file tail $src]].cexp" 2
+	set done_p 0
+	catch "set done_p \[source [file rootname $src].cexp\]"
+	if { $done_p } {
+	    return
+	}
+    }
+   
+    # Look for a loop within the source code - if we don't find one,
+    # don't pass -funroll[-all]-loops.
+    global torture_with_loops torture_without_loops
+    if [expr [search_for $src "do *\[0-9\]"]+[search_for $src "end *do"]] then {
+	set option_list $torture_with_loops
+    } else {
+	set option_list $torture_without_loops
+    }
+
+    set executable $tmpdir/[file tail [file rootname $src].x]
+
+    regsub "^$srcdir/?" $src "" testcase
+    # If we couldn't rip $srcdir out of `src' then just do the best we can.
+    # The point is to reduce the unnecessary noise in the logs.  Don't strip
+    # out too much because different testcases with the same name can confuse
+    # `test-tool'.
+    if [string match "/*" $testcase] {
+	set testcase "[file tail [file dirname $src]]/[file tail $src]"
+    }
+
+    foreach option $option_list {
+	# torture_{compile,execute}_xfail are set by the .cexp script
+	# (if present)
+	if [info exists torture_compile_xfail] {
+	    setup_xfail $torture_compile_xfail
+	}
+	remote_file build delete $executable
+	verbose "Testing $testcase, $option" 1
+
+	set options ""
+	lappend options "additional_flags=-w $option"
+	set comp_output [objc_target_compile "$src" "$executable" executable $options];
+
+	# Set a few common compiler messages.
+	set fatal_signal "*77*: Internal compiler error: program*got fatal signal"
+	
+	if [string match "$fatal_signal 6" $comp_output] then {
+	    objc_fail $testcase "Got Signal 6, $option"
+	    remote_file build delete $executable
+	    continue
+	}
+	
+	if [string match "$fatal_signal 11" $comp_output] then {
+	    objc_fail $testcase "Got Signal 11, $option"
+	    remote_file build delete $executable
+	    continue
+	}
+	
+	# We shouldn't get these because of -w, but just in case.
+	if [string match "*77*:*warning:*" $comp_output] then {
+	    warning "$testcase: (with warnings) $option"
+	    send_log "$comp_output\n"
+	    unresolved "$testcase, $option"
+	    remote_file build delete $executable
+	    continue
+	}
+	
+	set comp_output [prune_warnings $comp_output]
+	
+	set unsupported_message [objc_check_unsupported_p $comp_output]
+
+	if { $unsupported_message != "" } {
+	    unsupported "$testcase: $unsupported_message"
+	    continue
+	} elseif ![file exists $executable] {
+	    if ![is3way] {
+		fail "$testcase compilation, $option"
+		untested "$testcase execution, $option"
+		continue
+	    } else {
+		# FIXME: since we can't test for the existance of a remote
+		# file without short of doing an remote file list, we assume
+		# that since we got no output, it must have compiled.
+		pass "$testcase compilation, $option"		
+	    }
+	} else {
+	    pass "$testcase compilation, $option"
+	}
+
+	# See if this source file uses "long long" types, if it does, and
+	# no_long_long is set, skip execution of the test.
+	if [target_info exists no_long_long] then {
+	    if [expr [search_for $src "integer\*8"]] then {
+		untested "$testcase execution, $option"
+		continue
+	    }
+	}
+
+	if [info exists torture_execute_xfail] {
+	    setup_xfail $torture_execute_xfail
+	}
+	
+	set result [objc_load "$executable" "" ""]
+	set status [lindex $result 0];
+	set output [lindex $result 1];
+        if { $status == "pass" } {
+	    remote_file build delete $executable
+        }
+	$status "$testcase execution, $option"
+    }
+}
+
+#
+# search_for -- looks for a string match in a file
+#
+proc search_for { file pattern } {
+    set fd [open $file r]
+    while { [gets $fd cur_line]>=0 } {
+	set lower [string tolower $cur_line]
+	if [regexp "$pattern" $lower] then {
+	    close $fd
+	    return 1
+	}
+    }
+    close $fd
+    return 0
+}
+
+#
+# objc-torture -- the objc-torture testcase source file processor
+#
+# This runs compilation only tests (no execute tests).
+# SRC is the full pathname of the testcase, or just a file name in which case
+# we prepend $srcdir/$subdir.
+#
+# If the testcase has an associated .cexp file, we source that to run the
+# test instead.  We use .cexp instead of .exp so that the testcase is still
+# controlled by the main .exp driver (this is useful when one wants to only
+# run the compile.exp tests for example - one need only pass compile.exp to
+# dejagnu, and not compile.exp, foo1.exp, foo2.exp, etc.).
+#
+proc objc-torture { args } {
+    global srcdir subdir
+
+    set src [lindex $args 0];
+    if { [llength $args] > 1 } {
+	set options [lindex $args 1];
+    } else {
+	set options ""
+    }
+
+    # Prepend $srdir/$subdir if missing.
+    if ![string match "*/*" $src] {
+	set src "$srcdir/$subdir/$src"
+    }
+
+    # Check for alternate driver.
+    if [file exists [file rootname $src].cexp] {
+	verbose "Using alternate driver [file rootname [file tail $src]].cexp" 2
+	set done_p 0
+	catch "set done_p \[source [file rootname $src].cexp\]"
+	if { $done_p } {
+	    return
+	}
+    }
+   
+    # Look for a loop within the source code - if we don't find one,
+    # don't pass -funroll[-all]-loops.
+    global torture_with_loops torture_without_loops
+    if [expr [search_for $src "do *\[0-9\]"]+[search_for $src "end *do"]] then {
+	set option_list $torture_with_loops
+    } else {
+	set option_list $torture_without_loops
+    }
+
+    # loop through all the options
+    foreach option $option_list {
+	# torture_compile_xfail is set by the .cexp script (if present)
+	if [info exists torture_compile_xfail] {
+	    setup_xfail $torture_compile_xfail
+	}
+
+	objc-torture-compile $src "$option $options"
+    }
+}

gcc/testsuite/lib/objc.exp

@@ -0,0 +1,263 @@
+# Copyright (C) 1992, 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# This file was written by Rob Savoye (rob@cygnus.com)
+# Currently maintained by Doug Evans (dje@cygnus.com)
+
+# This file is loaded by the tool init file (eg: unix.exp).  It provides
+# default definitions for objc_start, etc. and other supporting cast members.
+
+# These globals are used by objc_start if no compiler arguments are provided.
+# They are also used by the various testsuites to define the environment:
+# where to find stdio.h, libc.a, etc.
+
+#
+# OBJC_UNDER_TEST is the compiler under test.
+#
+
+#
+# default_objc_version -- extract and print the version number of the compiler
+#
+
+proc default_objc_version { } {
+    global OBJC_UNDER_TEST
+
+    objc_init;
+
+    # ignore any arguments after the command
+    set compiler [lindex $OBJC_UNDER_TEST 0]
+
+    if ![is_remote host] {
+	set compiler_name [which $compiler];
+    } else {
+	set compiler_name $compiler;
+    }
+
+    # verify that the compiler exists
+    if { $compiler_name != 0 } then {
+	set tmp [remote_exec host "$compiler -v"]
+	set status [lindex $tmp 0];
+	set output [lindex $tmp 1];
+	regexp "version.*$" $output version
+	if { $status == 0 && [info exists version] } then {
+	    clone_output "$compiler_name $version\n"
+	} else {
+	    clone_output "Couldn't determine version of $compiler_name: $output\n"
+	}
+    } else {
+	# compiler does not exist (this should have already been detected)
+	warning "$compiler does not exist"
+    }
+}
+
+#
+# Call objc_version. We do it this way so we can override it if needed.
+#
+proc objc_version { } {
+    default_objc_version;
+}
+
+#
+# objc_init -- called at the start of each .exp script.
+#
+# There currently isn't much to do, but always using it allows us to
+# make some enhancements without having to go back and rewrite the scripts.
+#
+
+set objc_initialized 0
+
+proc objc_init { args } {
+    global tmpdir
+    global libdir
+    global gluefile wrap_flags
+    global objc_initialized
+    global OBJC_UNDER_TEST
+    global TOOL_EXECUTABLE
+
+    if { $objc_initialized == 1 } { return; }
+
+    if ![info exists OBJC_UNDER_TEST] then {
+	if [info exists TOOL_EXECUTABLE] {
+	    set OBJC_UNDER_TEST $TOOL_EXECUTABLE;
+	} else {
+	    set OBJC_UNDER_TEST [find_gcc]
+	}
+    }
+
+    if ![info exists tmpdir] then {
+	set tmpdir /tmp
+    }
+    if { [target_info needs_status_wrapper]!="" && ![info exists gluefile] } {
+	set gluefile ${tmpdir}/testglue.o;
+	set result [build_wrapper $gluefile];
+	if { $result != "" } {
+	    set gluefile [lindex $result 0];
+	    set wrap_flags [lindex $result 1];
+	} else {
+	    unset gluefile
+	}
+    }
+}
+
+proc objc_target_compile { source dest type options } {
+    global tmpdir;
+    global gluefile wrap_flags;
+    global OBJC_UNDER_TEST
+    global TOOL_OPTIONS
+
+    lappend options "libs=-lobjc"
+    if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } {
+	lappend options "libs=${gluefile}"
+	lappend options "ldflags=$wrap_flags"
+    }
+
+    if [target_info exists objc,stack_size] {
+	lappend options "additional_flags=-DSTACK_SIZE=[target_info objc,stack_size]"
+    }
+    if [target_info exists objc,no_trampolines] {
+	lappend options "additional_flags=-DNO_TRAMPOLINES"
+    }
+    if [target_info exists objc,no_label_values] {
+	lappend options "additional_flags=-DNO_LABEL_VALUES"
+    }
+    if [info exists TOOL_OPTIONS] {
+	lappend options "additional_flags=$TOOL_OPTIONS"
+    }
+    if [target_info exists objc,no_varargs] {
+	lappend options "additional_flags=-DNO_VARARGS"
+    }
+    lappend options "compiler=$OBJC_UNDER_TEST"
+    return [target_compile $source $dest $type $options]
+}
+
+#
+# objc_pass -- utility to record a testcase passed
+#
+
+proc objc_pass { testcase cflags } {
+    if { "$cflags" == "" } {
+	pass "$testcase"
+    } else {
+	pass "$testcase, $cflags"
+    }
+}
+
+#
+# objc_fail -- utility to record a testcase failed
+#
+
+proc objc_fail { testcase cflags } {
+    if { "$cflags" == "" } {
+	fail "$testcase"
+    } else {
+	fail "$testcase, $cflags"
+    }
+}
+
+#
+# objc_finish -- called at the end of every .exp script that calls objc_init
+#
+# The purpose of this proc is to hide all quirks of the testing environment
+# from the testsuites.  It also exists to undo anything that objc_init did
+# (that needs undoing).
+#
+
+proc objc_finish { } {
+    # The testing harness apparently requires this.
+    global errorInfo;
+
+    if [info exists errorInfo] then {
+	unset errorInfo
+    }
+
+    # Might as well reset these (keeps our caller from wondering whether
+    # s/he has to or not).
+    global prms_id bug_id
+    set prms_id 0
+    set bug_id 0
+}
+
+proc objc_exit { } {
+    global gluefile;
+
+    if [info exists gluefile] {
+	file_on_build delete $gluefile;
+	unset gluefile;
+    }
+}
+    
+# If this is an older version of dejagnu (without runtest_file_p),
+# provide one and assume the old syntax: foo1.exp bar1.c foo2.exp bar2.c.
+# This can be deleted after next dejagnu release.
+
+if { [info procs runtest_file_p] == "" } then {
+    proc runtest_file_p { runtests testcase } {
+	if { $runtests != "" && [regexp "\[.\]\[cC\]" $runtests] } then {
+	    if { [lsearch $runtests [file tail $testcase]] >= 0 } then {
+		return 1
+	    } else {
+		return 0
+	    }
+	}
+	return 1
+    }
+}
+
+# Provide a definition of this if missing (delete after next dejagnu release).
+
+if { [info procs prune_warnings] == "" } then {
+    proc prune_warnings { text } {
+	return $text
+    }
+}
+
+# Utility used by mike-gcc.exp and c-torture.exp.
+# Check the compiler(/assembler/linker) output for text indicating that
+# the testcase should be marked as "unsupported".
+#
+# When dealing with a large number of tests, it's difficult to weed out the
+# ones that are too big for a particular cpu (eg: 16 bit with a small amount
+# of memory).  There are various ways to deal with this.  Here's one.
+# Fortunately, all of the cases where this is likely to happen will be using
+# gld so we can tell what the error text will look like.
+
+proc ${tool}_check_unsupported_p { output } {
+    if [regexp "(^|\n)\[^\n\]*: region \[^\n\]* is full" $output] {
+	return "memory full"
+    }
+    return ""
+}
+
+# Prune messages from objc that aren't useful.
+
+proc prune_objc_output { text } {
+    #send_user "Before:$text\n"
+    regsub -all "(^|\n)\[^\n\]*: In (function|method) \[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*: At top level:\[^\n\]*" $text "" text
+
+    # It would be nice to avoid passing anything to objc that would cause it to
+    # issue these messages (since ignoring them seems like a hack on our part),
+    # but that's too difficult in the general case.  For example, sometimes
+    # you need to use -B to point objc at crt0.o, but there are some targets
+    # that don't have crt0.o.
+    regsub -all "(^|\n)\[^\n\]*file path prefix \[^\n\]* never used" $text "" text
+    regsub -all "(^|\n)\[^\n\]*linker input file unused since linking not done" $text "" text
+
+    #send_user "After:$text\n"
+
+    return $text
+}
+

gcc/testsuite/objc/execute/bf-1.m

@@ -0,0 +1,24 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a;
+  struct {
+    int i:2;
+    int j:3;
+    int k:12;
+  } flags;
+  char c;
+//  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-10.m

@@ -0,0 +1,22 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  int i:2;
+  int j:6;
+  char c;
+  int k:12;
+  char d;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-11.m

@@ -0,0 +1,23 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  int i:2;
+  int j:6;
+  short s;
+  int k:12;
+  char d;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-12.m

@@ -0,0 +1,23 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  int i:2;
+  int j:6;
+  int s;
+  int k:12;
+  char d;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-13.m

@@ -0,0 +1,25 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  struct {
+    int i:2;
+    int j:6;
+    char s;
+    int k:12;
+  } flags;
+  char d;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-14.m

@@ -0,0 +1,25 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  struct {
+    int i:2;
+    int j:6;
+    short s;
+    int k:12;
+  } flags;
+  char d;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-15.m

@@ -0,0 +1,25 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a;
+  struct {
+    int i:2;
+    int j:6;
+    int s;
+    int k:12;
+  } flags;
+  char d;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-16.m

@@ -0,0 +1,26 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+struct A {
+  int i;
+  float f;
+  int a:3;
+  int b:2;
+};
+
+@interface MyObject
+{
+  Class isa;
+  int i;
+  float f[3];
+  struct A a, b;
+  char c;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-17.m

@@ -0,0 +1,25 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+struct A {
+  int i;
+  float f;
+  int a:3;
+  int b:2;
+};
+
+@interface MyObject
+{
+  Class isa;
+  int i;
+  float f[3];
+  struct A a;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-18.m

@@ -0,0 +1,17 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  int i;
+  char c[1];
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-19.m

@@ -0,0 +1,17 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  unsigned int i;
+  MyObject *object;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-2.m

@@ -0,0 +1,24 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  struct {
+    int i:2;
+    int j:3;
+    int k:12;
+  } flags;
+  char c;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-3.m

@@ -0,0 +1,24 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a;
+  struct {
+    int i:2;
+    int j:6;
+    int k:12;
+  } flags;
+  char c;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-4.m

@@ -0,0 +1,24 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  struct {
+    int i:2;
+    int j:6;
+    int k:12;
+  } flags;
+  char c;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-5.m

@@ -0,0 +1,22 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a;
+  int i:2;
+  int j:3;
+  int k:12;
+  char c;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-6.m

@@ -0,0 +1,22 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  int i:2;
+  int j:3;
+  int k:12;
+  char c;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-7.m

@@ -0,0 +1,22 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a;
+  int i:2;
+  int j:6;
+  int k:12;
+  char c;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-8.m

@@ -0,0 +1,22 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  int i:2;
+  int j:6;
+  int k:12;
+  char c;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-9.m

@@ -0,0 +1,23 @@
+#include <objc/objc.h>
+#include <objc/objc-api.h>
+#include <objc/Object.h>
+
+@interface MyObject
+{
+  Class isa;
+  float f;
+  char a[3];
+  int i:2;
+  int j:3;
+  char c;
+  int k:12;
+  char d;
+  void *pointer;
+}
+@end
+
+@implementation MyObject
+@end
+
+#include "bf-common.h"
+

gcc/testsuite/objc/execute/bf-common.h

@@ -0,0 +1,76 @@
+#include <objc/encoding.h>
+
+
+void print_ivars (Class class)
+{
+  struct objc_ivar_list* ivars = class->ivars;
+  int i;
+
+  for (i = 0; i < ivars->ivar_count; i++) {
+    struct objc_ivar *ivar = &(ivars->ivar_list[i]);
+    printf ("ivar '%s', type '%s', offset %d\n",
+	    ivar->ivar_name, ivar->ivar_type, ivar->ivar_offset);
+  }
+}
+
+void compare_structures (Class class, const char* type)
+{
+  struct objc_struct_layout layout;
+  struct objc_ivar_list* ivars = class->ivars;
+  int i = 0;
+  int position;
+
+  objc_layout_structure (type, &layout);
+
+  while (objc_layout_structure_next_member (&layout))
+    {
+      struct objc_ivar *ivar;
+      const char *ivar_type;
+
+      if (i > ivars->ivar_count)
+        {
+          printf ("too many ivars in type %s, layout = %s\n",
+                  type, layout.type);
+          exit (1);
+        }
+
+      ivar = &(ivars->ivar_list[i]);
+      objc_layout_structure_get_info (&layout, &position, NULL, &ivar_type);
+      printf ("real ivar '%s' offset %d\n",
+              ivar->ivar_name, ivar->ivar_offset);
+      printf ("computed type '%s' offset %d\n", ivar_type, position);
+      if (position != ivar->ivar_offset)
+        {
+          printf ("offset %d and computed position %d don't match on ivar '%s'"
+                  " (i = %d)\n",
+                  ivar->ivar_offset, position, ivar->ivar_name, i);
+          exit (1);
+        }
+      i++;
+    }
+  
+  printf ("%d ivars checked\n", i);
+}
+
+int main ()
+{
+  struct class_vars
+    {
+      @defs (MyObject);
+    };
+  int size1, size2;
+  Class class = [MyObject class];
+
+  printf ("type = %s\n", @encode (struct class_vars));
+  print_ivars (class);
+
+  compare_structures (class, @encode(struct class_vars));
+  if ((size1 = objc_sizeof_type (@encode(struct class_vars)))
+      != (size2 = sizeof (struct class_vars)))
+    {
+      printf ("sizes don't match (computed %d, exact %d)\n", size1, size2);
+      abort ();
+    }
+  
+  exit (0);
+}

gcc/testsuite/objc/execute/execute.exp

@@ -0,0 +1,42 @@
+# Copyright (C) 1991, 1992, 1993, 1995, 1997 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-gcc@prep.ai.mit.edu
+
+# This file was written by Rob Savoye. (rob@cygnus.com)
+# Modified by Ovidiu Predescu (ovidiu@aracnet.com)
+
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+# load support procs
+load_lib objc-torture.exp
+
+#
+# main test loop
+#
+
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.m]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] then {
+	continue
+    }
+
+    objc-torture-execute $src
+}